Plugin Directory

Changeset 1354609


Ignore:
Timestamp:
02/20/2016 05:25:24 AM (10 years ago)
Author:
Cimmo
Message:

Fixed MYSQL error on WordPress MS when creating sites through other plug-ins (thanks to Kathy Goss)

Location:
cimy-user-extra-fields/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • cimy-user-extra-fields/trunk/README_OFFICIAL.txt

    r1353917 r1354609  
    634634v2.7.2 - /02/2016
    635635- Fixed registration rules were applied on profile update when certain plug-ins are installed, like bbpress (thanks to Vane R.)
     636- Fixed MYSQL error on WordPress MS when creating sites through other plug-ins (thanks to Kathy Goss)
    636637- Fixed PHP Notice:  Undefined index: welcome_email on WordPress MS
    637638
  • cimy-user-extra-fields/trunk/cimy_uef_db.php

    r746854 r1354609  
    334334    }
    335335
    336     if ($wpdb->get_var("SHOW TABLES LIKE '".$wpdb->prefix."signups'") != $wpdb->prefix."signups") {
    337 
    338         $sql = "CREATE TABLE ".$wpdb->prefix."signups (
     336    if ($wpdb->get_var("SHOW TABLES LIKE '".$wpdb->base_prefix."signups'") != $wpdb->base_prefix."signups") {
     337
     338        $sql = "CREATE TABLE ".$wpdb->base_prefix."signups (
    339339            domain varchar(200) NOT NULL default '',
    340340            path varchar(100) NOT NULL default '',
     
    603603    global $wpdb;
    604604
    605     return $wpdb->get_row($wpdb->prepare("SELECT user_login, user_email, meta FROM ".$wpdb->prefix."signups WHERE user_login = %s AND active = %d", $user_login, 0), ARRAY_A);
     605    return $wpdb->get_row($wpdb->prepare("SELECT user_login, user_email, meta FROM ".$wpdb->base_prefix."signups WHERE user_login = %s AND active = %d", $user_login, 0), ARRAY_A);
    606606}
    607607
     
    609609    global $wpdb;
    610610
    611     return $wpdb->get_row($wpdb->prepare("SELECT user_login, user_email, meta FROM ".$wpdb->prefix."signups WHERE domain = %s AND path = %s AND active = %d", $domain, $path, 0), ARRAY_A);
    612 }
     611    return $wpdb->get_row($wpdb->prepare("SELECT user_login, user_email, meta FROM ".$wpdb->base_prefix."signups WHERE domain = %s AND path = %s AND active = %d", $domain, $path, 0), ARRAY_A);
     612}
  • cimy-user-extra-fields/trunk/cimy_uef_email_handler.php

    r1330949 r1354609  
    286286    // seems no more required since WP 3.1
    287287//  require_once( ABSPATH . WPINC . '/registration.php');
    288     $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."signups WHERE activation_key = %s", $key) );
     288    $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM ".$wpdb->base_prefix."signups WHERE activation_key = %s", $key) );
    289289
    290290    if ( empty($signup) )
     
    324324    $now = current_time('mysql', true);
    325325
    326     $wpdb->update( $wpdb->prefix."signups", array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
     326    $wpdb->update( $wpdb->base_prefix."signups", array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
    327327
    328328    if ($user_already_exists)
     
    338338
    339339    // Has someone already signed up for this username?
    340     $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."signups WHERE user_login = %s", $user_name) );
     340    $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM ".$wpdb->base_prefix."signups WHERE user_login = %s", $user_name) );
    341341    if ( $signup != null ) {
    342342        $registered_at =  mysql2date('U', $signup->registered);
     
    345345        // If registered more than two days ago or already approved and then deleted, cancel registration and let this signup go through.
    346346        if (($diff > 172800) || ($signup->active))
    347             $wpdb->query( $wpdb->prepare("DELETE FROM ".$wpdb->prefix."signups WHERE user_login = %s", $user_name) );
     347            $wpdb->query( $wpdb->prepare("DELETE FROM ".$wpdb->base_prefix."signups WHERE user_login = %s", $user_name) );
    348348        else
    349349            $errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.', $cimy_uef_domain));
     
    353353    }
    354354
    355     $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."signups WHERE user_email = %s", $user_email) );
     355    $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM ".$wpdb->base_prefix."signups WHERE user_email = %s", $user_email) );
    356356    if ( $signup != null ) {
    357357        $diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
    358358        // If registered more than two days ago or already approved and then deleted, cancel registration and let this signup go through.
    359359        if (($diff > 172800) || ($signup->active))
    360             $wpdb->query( $wpdb->prepare("DELETE FROM ".$wpdb->prefix."signups WHERE user_email = %s", $user_email) );
     360            $wpdb->query( $wpdb->prepare("DELETE FROM ".$wpdb->base_prefix."signups WHERE user_email = %s", $user_email) );
    361361        else
    362362            $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.', $cimy_uef_domain));
  • cimy-user-extra-fields/trunk/cimy_uef_register.php

    r1353908 r1354609  
    5959            $key = esc_sql($key);
    6060
    61             $sql = "SELECT active, meta FROM ".$wpdb->signups." WHERE activation_key='".$key."'";
     61            $sql = "SELECT active, meta FROM ".$wpdb->base_prefix."signups WHERE activation_key='".$key."'";
    6262            $data = $wpdb->get_results($sql);
    6363
     
    112112    // ok ok this is yet another call from wp_create_user function under cimy_uef_activate_signup, we are not yet ready for this, aboooort!
    113113    if ($user_signups) {
    114         $signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."signups WHERE user_login = %s AND active = 0", $user_login));
     114        $signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".$wpdb->base_prefix."signups WHERE user_login = %s AND active = 0", $user_login));
    115115        if (!empty($signup))
    116116            return;
    117117    }
    118118    if (!empty($meta)) {
    119         $meta_db = $wpdb->get_var($wpdb->prepare("SELECT meta FROM ".$wpdb->prefix."signups WHERE user_login = %s", $user_login));
     119        $meta_db = $wpdb->get_var($wpdb->prepare("SELECT meta FROM ".$wpdb->base_prefix."signups WHERE user_login = %s", $user_login));
    120120        $meta_db = unserialize($meta_db);
    121121        // password detected, kill it!
     
    124124            if (!empty($meta_db['cimy_uef_wp_PASSWORD2']))
    125125                unset($meta_db['cimy_uef_wp_PASSWORD2']);
    126             $wpdb->update($wpdb->prefix."signups", array('meta' => serialize($meta_db)), array('user_login' => $user_login));
     126            $wpdb->update($wpdb->base_prefix."signups", array('meta' => serialize($meta_db)), array('user_login' => $user_login));
    127127        }
    128128    }
     
    274274        $key = substr( md5( time() . rand() . $saved_user->user_email ), 0, 16 );
    275275
    276         $wpdb->insert($wpdb->prefix."signups", array(
     276        $wpdb->insert($wpdb->base_prefix."signups", array(
    277277            'user_login' => $saved_user->user_login,
    278278            'user_email' => $saved_user->user_email,
  • cimy-user-extra-fields/trunk/cimy_user_extra_fields.php

    r1353893 r1354609  
    44Plugin URI: http://www.marcocimmino.net/cimy-wordpress-plugins/cimy-user-extra-fields/
    55Description: Add some useful fields to registration and user's info
    6 Version: 2.7.1.99
     6Version: 2.7.1.100
    77Author: Marco Cimmino
    88Author URI: mailto:cimmino.marco@gmail.com
Note: See TracChangeset for help on using the changeset viewer.