search-replace: blacklist user_pass column later

diff --git a/php/commands/search-replace.php b/php/commands/search-replace.php
index 77c47a9..2d20e25 100644 (file)
--- a/php/commands/search-replace.php
+++ b/php/commands/search-replace.php
@@ -45,10 +45,6 @@ class Search_Replace_Command extends WP_CLI_Command {
                                }
 
                                $tables = array_merge( $mu_tables, $tables );
-                               if ( isset( $assoc_args['skip-columns'] ) )
-                                       $assoc_args['skip-columns'] .= ",user_pass";
-                               else
-                                       $assoc_args['skip-columns'] .= "user_pass";
                        }
                }
                // end build list of tables to find/replace
@@ -58,6 +54,9 @@ class Search_Replace_Command extends WP_CLI_Command {
                else
                        $skip_columns = array();
 
+               // never mess with hashed passwords
+               $skip_columns[] = 'user_pass';
+
                foreach ( $tables as $table ) {
                        list( $primary_key, $columns ) = self::get_columns( $table );
                        foreach ( $columns as $col ) {