Skip to:
Content

bbPress.org

Changeset 5530


Ignore:
Timestamp:
09/20/2014 06:06:08 AM (10 years ago)
Author:
netweb
Message:

Converter import user meta data improvements and fixes:

  • Original 'old' user meta key is now defined using _bbp_old_user_id
  • Fixes the "Purge Previous Import" optional removal of previously imported users when using the database sync_table.
  • Updates all included importers with the above changes including the custom callback in e107v1.php

See #2650

Location:
trunk/src/includes/admin
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/admin/converter.php

    r5527 r5530  
    12411241
    12421242        if ( true === $this->sync_table ) {
    1243             $query = 'SELECT value_id FROM ' . $this->sync_table_name . ' INNER JOIN ' . $this->wpdb->users . ' ON(value_id = ID) WHERE meta_key = "_bbp_user_id" AND value_type = "user" LIMIT ' . $this->max_rows;
     1243            $query = 'SELECT value_id FROM ' . $this->sync_table_name . ' INNER JOIN ' . $this->wpdb->users . ' ON(value_id = ID) WHERE meta_key = "_bbp_old_user_id" AND value_type = "user" LIMIT ' . $this->max_rows;
    12441244        } else {
    1245             $query = 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_user_id" LIMIT ' . $this->max_rows;
     1245            $query = 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_old_user_id" LIMIT ' . $this->max_rows;
    12461246        }
    12471247
     
    14311431        if ( !isset( $this->map_userid[$field] ) ) {
    14321432            if ( !empty( $this->sync_table ) ) {
    1433                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
     1433                $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
    14341434            } else {
    1435                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
     1435                $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
    14361436            }
    14371437
  • trunk/src/includes/admin/converters/AEF.php

    r5526 r5530  
    419419        /** User Section ******************************************************/
    420420
    421         // Store old User id (Stored in usermeta)
     421        // Store old user id (Stored in usermeta)
    422422        $this->field_map[] = array(
    423423            'from_tablename' => 'users',
    424424            'from_fieldname' => 'id',
    425425            'to_type'        => 'user',
    426             'to_fieldname'   => '_bbp_user_id'
    427         );
    428 
    429         // Store old User password (Stored in usermeta serialized with salt)
     426            'to_fieldname'   => '_bbp_old_user_id'
     427        );
     428
     429        // Store old user password (Stored in usermeta serialized with salt)
    430430        $this->field_map[] = array(
    431431            'from_tablename'  => 'users',
     
    436436        );
    437437
    438         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     438        // Store old user salt (This is only used for the SELECT row info for the above password save)
    439439        $this->field_map[] = array(
    440440            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/Drupal7.php

    r5527 r5530  
    423423        /** User Section ******************************************************/
    424424
    425         // Store old User id (Stored in usermeta)
     425        // Store old user id (Stored in usermeta)
    426426        $this->field_map[] = array(
    427427            'from_tablename' => 'users',
    428428            'from_fieldname' => 'uid',
    429429            'to_type'        => 'user',
    430             'to_fieldname'   => '_bbp_user_id'
    431         );
    432 
    433         // Store old User password (Stored in usermeta serialized with salt)
     430            'to_fieldname'   => '_bbp_old_user_id'
     431        );
     432
     433        // Store old user password (Stored in usermeta serialized with salt)
    434434        $this->field_map[] = array(
    435435            'from_tablename'  => 'users',
     
    440440        );
    441441
    442         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     442        // Store old user salt (This is only used for the SELECT row info for the above password save)
    443443        $this->field_map[] = array(
    444444            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/Example.php

    r5526 r5530  
    496496        // Setup table joins for the user section at the base of this section
    497497
    498         // Store old User id (Stored in usermeta)
     498        // Store old user id (Stored in usermeta)
    499499        $this->field_map[] = array(
    500500            'from_tablename'  => 'users_table',
    501501            'from_fieldname'  => 'the_users_id',
    502502            'to_type'         => 'user',
    503             'to_fieldname'    => '_bbp_user_id'
    504         );
    505 
    506         // Store old User password (Stored in usermeta serialized with salt)
     503            'to_fieldname'    => '_bbp_old_user_id'
     504        );
     505
     506        // Store old user password (Stored in usermeta serialized with salt)
    507507        $this->field_map[] = array(
    508508            'from_tablename'  => 'users_table',
     
    513513        );
    514514
    515         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     515        // Store old user salt (This is only used for the SELECT row info for the above password save)
    516516        $this->field_map[] = array(
    517517            'from_tablename'  => 'users_table',
  • trunk/src/includes/admin/converters/FluxBB.php

    r5526 r5530  
    393393        /** User Section ******************************************************/
    394394
    395         // Store old User id (Stored in usermeta)
     395        // Store old user id (Stored in usermeta)
    396396        $this->field_map[] = array(
    397397            'from_tablename' => 'users',
    398398            'from_fieldname' => 'id',
    399399            'to_type'        => 'user',
    400             'to_fieldname'   => '_bbp_user_id'
    401         );
    402 
    403         // Store old User password (Stored in usermeta serialized with salt)
     400            'to_fieldname'   => '_bbp_old_user_id'
     401        );
     402
     403        // Store old user password (Stored in usermeta serialized with salt)
    404404        $this->field_map[] = array(
    405405            'from_tablename'  => 'users',
     
    410410        );
    411411
    412         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     412        // Store old user salt (This is only used for the SELECT row info for the above password save)
    413413//      $this->field_map[] = array(
    414414//          'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/Invision.php

    r5526 r5530  
    382382        /** User Section ******************************************************/
    383383
    384         // Store old User id (Stored in usermeta)
     384        // Store old user id (Stored in usermeta)
    385385        $this->field_map[] = array(
    386386            'from_tablename'  => 'members',
    387387            'from_fieldname'  => 'member_id',
    388388            'to_type'         => 'user',
    389             'to_fieldname'    => '_bbp_user_id'
    390         );
    391 
    392         // Store old User password (Stored in usermeta serialized with salt)
     389            'to_fieldname'    => '_bbp_old_user_id'
     390        );
     391
     392        // Store old user password (Stored in usermeta serialized with salt)
    393393        $this->field_map[] = array(
    394394            'from_tablename'  => 'members',
     
    399399        );
    400400
    401         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     401        // Store old user salt (This is only used for the SELECT row info for the above password save)
    402402        $this->field_map[] = array(
    403403            'from_tablename'  => 'members',
  • trunk/src/includes/admin/converters/Kunena1.php

    r5526 r5530  
    376376        //Note: We are importing the Joomla User details and the Kunena v1.x user profile details.
    377377
    378         // Store old User id (Stored in usermeta)
     378        // Store old user id (Stored in usermeta)
    379379        $this->field_map[] = array(
    380380            'from_tablename' => 'users',
    381381            'from_fieldname' => 'id',
    382382            'to_type'        => 'user',
    383             'to_fieldname'   => '_bbp_user_id'
    384         );
    385 
    386         // Store old User password (Stored in usermeta serialized with salt)
     383            'to_fieldname'   => '_bbp_old_user_id'
     384        );
     385
     386        // Store old user password (Stored in usermeta serialized with salt)
    387387        $this->field_map[] = array(
    388388            'from_tablename'  => 'users',
     
    393393        );
    394394
    395         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     395        // Store old user salt (This is only used for the SELECT row info for the above password save)
    396396//      $this->field_map[] = array(
    397397//          'from_tablename' => 'user',
  • trunk/src/includes/admin/converters/Kunena2.php

    r5526 r5530  
    395395        //Note: We are importing the Joomla User details and the Kunena v2.x user profile details.
    396396
    397         // Store old User id (Stored in usermeta)
     397        // Store old user id (Stored in usermeta)
    398398        $this->field_map[] = array(
    399399            'from_tablename' => 'users',
    400400            'from_fieldname' => 'id',
    401401            'to_type'        => 'user',
    402             'to_fieldname'   => '_bbp_user_id'
    403         );
    404 
    405         // Store old User password (Stored in usermeta serialized with salt)
     402            'to_fieldname'   => '_bbp_old_user_id'
     403        );
     404
     405        // Store old user password (Stored in usermeta serialized with salt)
    406406        $this->field_map[] = array(
    407407            'from_tablename'  => 'users',
     
    412412        );
    413413
    414         // Store old User Salt. This is only used for the SELECT row info for the above password save
     414        // Store old user salt. This is only used for the SELECT row info for the above password save
    415415        /*
    416416        $this->field_map[] = array(
  • trunk/src/includes/admin/converters/Kunena3.php

    r5526 r5530  
    394394        //Note: We are importing the Joomla User details and the Kunena v3.x user profile details.
    395395
    396         // Store old User id (Stored in usermeta)
     396        // Store old user id (Stored in usermeta)
    397397        $this->field_map[] = array(
    398398            'from_tablename' => 'users',
    399399            'from_fieldname' => 'id',
    400400            'to_type'        => 'user',
    401             'to_fieldname'   => '_bbp_user_id'
    402         );
    403 
    404         // Store old User password (Stored in usermeta serialized with salt)
     401            'to_fieldname'   => '_bbp_old_user_id'
     402        );
     403
     404        // Store old user password (Stored in usermeta serialized with salt)
    405405        $this->field_map[] = array(
    406406            'from_tablename'  => 'users',
     
    411411        );
    412412
    413         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     413        // Store old user salt (This is only used for the SELECT row info for the above password save)
    414414//      $this->field_map[] = array(
    415415//          'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/Mingle.php

    r5526 r5530  
    329329        /** User Section ******************************************************/
    330330
    331         // Store old User id (Stored in usermeta)
     331        // Store old user id (Stored in usermeta)
    332332        $this->field_map[] = array(
    333333            'from_tablename' => 'users',
    334334            'from_fieldname' => 'ID',
    335335            'to_type'        => 'user',
    336             'to_fieldname'   => '_bbp_user_id'
    337         );
    338 
    339         // Store old User password (Stored in usermeta)
     336            'to_fieldname'   => '_bbp_old_user_id'
     337        );
     338
     339        // Store old user password (Stored in usermeta)
    340340        $this->field_map[] = array(
    341341            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/MyBB.php

    r5526 r5530  
    381381        /** User Section ******************************************************/
    382382
    383         // Store old User id (Stored in usermeta)
     383        // Store old user id (Stored in usermeta)
    384384        $this->field_map[] = array(
    385385            'from_tablename' => 'users',
    386386            'from_fieldname' => 'uid',
    387387            'to_type'        => 'user',
    388             'to_fieldname'   => '_bbp_user_id'
    389         );
    390 
    391         // Store old User password (Stored in usermeta serialized with salt)
     388            'to_fieldname'   => '_bbp_old_user_id'
     389        );
     390
     391        // Store old user password (Stored in usermeta serialized with salt)
    392392        $this->field_map[] = array(
    393393            'from_tablename'  => 'users',
     
    398398        );
    399399
    400         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     400        // Store old user salt (This is only used for the SELECT row info for the above password save)
    401401        $this->field_map[] = array(
    402402            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/PHPFox3.php

    r5526 r5530  
    420420        /** User Section ******************************************************/
    421421
    422         // Store old User id (Stored in usermeta)
     422        // Store old user id (Stored in usermeta)
    423423        $this->field_map[] = array(
    424424            'from_tablename' => 'user',
    425425            'from_fieldname' => 'user_id',
    426426            'to_type'        => 'user',
    427             'to_fieldname'   => '_bbp_user_id'
    428         );
    429 
    430         // Store old User password (Stored in usermeta serialized with salt)
     427            'to_fieldname'   => '_bbp_old_user_id'
     428        );
     429
     430        // Store old user password (Stored in usermeta serialized with salt)
    431431        $this->field_map[] = array(
    432432            'from_tablename'  => 'user',
     
    437437        );
    438438
    439         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     439        // Store old user salt (This is only used for the SELECT row info for the above password save)
    440440        $this->field_map[] = array(
    441441            'from_tablename' => 'user',
  • trunk/src/includes/admin/converters/PHPWind.php

    r5526 r5530  
    401401        /** User Section ******************************************************/
    402402
    403         // Store old User id (Stored in usermeta)
     403        // Store old user id (Stored in usermeta)
    404404        $this->field_map[] = array(
    405405            'from_tablename' => 'user',
    406406            'from_fieldname' => 'uid',
    407407            'to_type'        => 'user',
    408             'to_fieldname'   => '_bbp_user_id'
    409         );
    410 
    411         // Store old User password (Stored in usermeta serialized with salt)
     408            'to_fieldname'   => '_bbp_old_user_id'
     409        );
     410
     411        // Store old user password (Stored in usermeta serialized with salt)
    412412        $this->field_map[] = array(
    413413            'from_tablename'  => 'user',
     
    418418        );
    419419
    420         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     420        // Store old user salt (This is only used for the SELECT row info for the above password save)
    421421/*      $this->field_map[] = array(
    422422            'from_tablename' => 'user',
  • trunk/src/includes/admin/converters/Phorum.php

    r5526 r5530  
    368368        /** User Section ******************************************************/
    369369
    370         // Store old User id (Stored in usermeta)
     370        // Store old user id (Stored in usermeta)
    371371        $this->field_map[] = array(
    372372            'from_tablename' => 'users',
    373373            'from_fieldname' => 'user_id',
    374374            'to_type'        => 'user',
    375             'to_fieldname'   => '_bbp_user_id'
    376         );
    377 
    378         // Store old User password (Stored in usermeta serialized with salt)
     375            'to_fieldname'   => '_bbp_old_user_id'
     376        );
     377
     378        // Store old user password (Stored in usermeta serialized with salt)
    379379        $this->field_map[] = array(
    380380            'from_tablename'  => 'users',
     
    385385        );
    386386
    387         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     387        // Store old user salt (This is only used for the SELECT row info for the above password save)
    388388//      $this->field_map[] = array(
    389389//          'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/PunBB.php

    r5529 r5530  
    403403            'from_expression' => 'WHERE id != 1',
    404404            'to_type'         => 'user',
    405             'to_fieldname'    => '_bbp_user_id'
    406         );
    407 
    408         // Store old User password (Stored in usermeta serialized with salt)
     405            'to_fieldname'    => '_bbp_old_user_id'
     406        );
     407
     408        // Store old user password (Stored in usermeta serialized with salt)
    409409        $this->field_map[] = array(
    410410            'from_tablename'  => 'users',
     
    415415        );
    416416
    417         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     417        // Store old user salt (This is only used for the SELECT row info for the above password save)
    418418        $this->field_map[] = array(
    419419            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/SMF.php

    r5526 r5530  
    420420        /** User Section ******************************************************/
    421421
    422         // Store old User id (Stored in usermeta)
     422        // Store old user id (Stored in usermeta)
    423423        $this->field_map[] = array(
    424424            'from_tablename' => 'members',
    425425            'from_fieldname' => 'id_member',
    426426            'to_type'        => 'user',
    427             'to_fieldname'   => '_bbp_user_id'
    428         );
    429 
    430         // Store old User password (Stored in usermeta serialized with salt)
     427            'to_fieldname'   => '_bbp_old_user_id'
     428        );
     429
     430        // Store old user password (Stored in usermeta serialized with salt)
    431431        $this->field_map[] = array(
    432432            'from_tablename'  => 'members',
  • trunk/src/includes/admin/converters/SimplePress5.php

    r5526 r5530  
    367367        /** User Section ******************************************************/
    368368
    369         // Store old User id (Stored in usermeta)
     369        // Store old user id (Stored in usermeta)
    370370        $this->field_map[] = array(
    371371            'from_tablename' => 'users',
    372372            'from_fieldname' => 'ID',
    373373            'to_type'        => 'user',
    374             'to_fieldname'   => '_bbp_user_id'
    375         );
    376 
    377         // Store old User password (Stored in usermeta)
     374            'to_fieldname'   => '_bbp_old_user_id'
     375        );
     376
     377        // Store old user password (Stored in usermeta)
    378378        $this->field_map[] = array(
    379379            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/Vanilla.php

    r5526 r5530  
    413413        /** User Section ******************************************************/
    414414
    415         // Store old User id (Stored in usermeta)
     415        // Store old user id (Stored in usermeta)
    416416        $this->field_map[] = array(
    417417            'from_tablename'  => 'User',
    418418            'from_fieldname'  => 'UserID',
    419419            'to_type'         => 'user',
    420             'to_fieldname'    => '_bbp_user_id'
    421         );
    422 
    423         // Store old User password (Stored in usermeta)
     420            'to_fieldname'    => '_bbp_old_user_id'
     421        );
     422
     423        // Store old user password (Stored in usermeta)
    424424        $this->field_map[] = array(
    425425            'from_tablename' => 'User',
  • trunk/src/includes/admin/converters/XMB.php

    r5526 r5530  
    423423        /** User Section ******************************************************/
    424424
    425         // Store old User id (Stored in usermeta)
     425        // Store old user id (Stored in usermeta)
    426426        $this->field_map[] = array(
    427427            'from_tablename' => 'members',
    428428            'from_fieldname' => 'uid',
    429429            'to_type'        => 'user',
    430             'to_fieldname'   => '_bbp_user_id'
     430            'to_fieldname'   => '_bbp_old_user_id'
    431431        );
    432432
  • trunk/src/includes/admin/converters/XenForo.php

    r5526 r5530  
    402402        /** User Section ******************************************************/
    403403
    404         // Store old User id (Stored in usermeta)
     404        // Store old user id (Stored in usermeta)
    405405        $this->field_map[] = array(
    406406            'from_tablename' => 'user',
    407407            'from_fieldname' => 'user_id',
    408408            'to_type'        => 'user',
    409             'to_fieldname'   => '_bbp_user_id'
     409            'to_fieldname'   => '_bbp_old_user_id'
    410410        );
    411411
  • trunk/src/includes/admin/converters/bbPress1.php

    r5526 r5530  
    461461        /** User Section ******************************************************/
    462462
    463         // Store old User id (Stored in usermeta)
     463        // Store old user id (Stored in usermeta)
    464464        $this->field_map[] = array(
    465465            'from_tablename' => 'users',
    466466            'from_fieldname' => 'ID',
    467467            'to_type'        => 'user',
    468             'to_fieldname'   => '_bbp_user_id'
    469         );
    470 
    471         // Store old User password (Stored in usermeta)
     468            'to_fieldname'   => '_bbp_old_user_id'
     469        );
     470
     471        // Store old user password (Stored in usermeta)
    472472        $this->field_map[] = array(
    473473            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/e107v1.php

    r5526 r5530  
    379379        /** User Section ******************************************************/
    380380
    381         // Store old User id (Stored in usermeta)
     381        // Store old user id (Stored in usermeta)
    382382        $this->field_map[] = array(
    383383            'from_tablename' => 'user',
    384384            'from_fieldname' => 'user_id',
    385385            'to_type'        => 'user',
    386             'to_fieldname'   => '_bbp_user_id'
    387         );
    388 
    389         // Store old User password (Stored in usermeta serialized with salt)
     386            'to_fieldname'   => '_bbp_old_user_id'
     387        );
     388
     389        // Store old user password (Stored in usermeta serialized with salt)
    390390        $this->field_map[] = array(
    391391            'from_tablename'  => 'user',
     
    569569        if ( !isset( $this->map_userid[$field] ) ) {
    570570            if ( !empty( $this->sync_table ) ) {
    571                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
     571                $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
    572572            } else {
    573                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
     573                $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
    574574            }
    575575
  • trunk/src/includes/admin/converters/phpBB.php

    r5528 r5530  
    410410        /** User Section ******************************************************/
    411411
    412         // Store old User id (Stored in usermeta)
     412        // Store old user id (Stored in usermeta)
    413413        // Don't import users with id 2, these are phpBB bot/crawler accounts
    414414        $this->field_map[] = array(
     
    417417            'from_expression' => 'WHERE user_type !=2',
    418418            'to_type'         => 'user',
    419             'to_fieldname'    => '_bbp_user_id'
    420         );
    421 
    422         // Store old User password (Stored in usermeta serialized with salt)
     419            'to_fieldname'    => '_bbp_old_user_id'
     420        );
     421
     422        // Store old user password (Stored in usermeta serialized with salt)
    423423        $this->field_map[] = array(
    424424            'from_tablename'  => 'users',
     
    429429        );
    430430
    431         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     431        // Store old user salt (This is only used for the SELECT row info for the above password save)
    432432        $this->field_map[] = array(
    433433            'from_tablename' => 'users',
  • trunk/src/includes/admin/converters/vBulletin.php

    r5526 r5530  
    439439        /** User Section ******************************************************/
    440440
    441         // Store old User id (Stored in usermeta)
     441        // Store old user id (Stored in usermeta)
    442442        $this->field_map[] = array(
    443443            'from_tablename' => 'user',
    444444            'from_fieldname' => 'userid',
    445445            'to_type'        => 'user',
    446             'to_fieldname'   => '_bbp_user_id'
    447         );
    448 
    449         // Store old User password (Stored in usermeta serialized with salt)
     446            'to_fieldname'   => '_bbp_old_user_id'
     447        );
     448
     449        // Store old user password (Stored in usermeta serialized with salt)
    450450        $this->field_map[] = array(
    451451            'from_tablename'  => 'user',
     
    456456        );
    457457
    458         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     458        // Store old user salt (This is only used for the SELECT row info for the above password save)
    459459        $this->field_map[] = array(
    460460            'from_tablename' => 'user',
  • trunk/src/includes/admin/converters/vBulletin3.php

    r5526 r5530  
    439439        /** User Section ******************************************************/
    440440
    441         // Store old User id (Stored in usermeta)
     441        // Store old user id (Stored in usermeta)
    442442        $this->field_map[] = array(
    443443            'from_tablename' => 'user',
    444444            'from_fieldname' => 'userid',
    445445            'to_type'        => 'user',
    446             'to_fieldname'   => '_bbp_user_id'
    447         );
    448 
    449         // Store old User password (Stored in usermeta serialized with salt)
     446            'to_fieldname'   => '_bbp_old_user_id'
     447        );
     448
     449        // Store old user password (Stored in usermeta serialized with salt)
    450450        $this->field_map[] = array(
    451451            'from_tablename'  => 'user',
     
    456456        );
    457457
    458         // Store old User Salt (This is only used for the SELECT row info for the above password save)
     458        // Store old user salt (This is only used for the SELECT row info for the above password save)
    459459        $this->field_map[] = array(
    460460            'from_tablename' => 'user',
Note: See TracChangeset for help on using the changeset viewer.