Context Navigation

Changeset 28305

Timestamp:

05/06/2014 05:26:47 PM (11 years ago)

Author:

wonderboymusic

Message:

In wp-admin/includes/upgrade.php, remove dead code:

In maybe_create_table() and maybe_add_column(), the response of $wpdb->query() is set to a variable that is never used.
In make_db_current_silent(), which is a wrapper for dbDelta, a variable is set that is not used. This function appears to be a copy-paste of make_db_current()'s dbDelta() call but is meant to return nothing, and still does not.

File:

-                      r27998
+                      r28305
         return true;
     //didn't find it try to create it.
     $q = $wpdb->query($create_ddl);
+    $wpdb->query($create_ddl);
     // we cannot directly tell that whether this succeeded!
     if ( $wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name )
 …
+    }
     //didn't find it try to create it.
     $q = $wpdb->query($create_ddl);
+    $wpdb->query($create_ddl);
     // we cannot directly tell that whether this succeeded!
     foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
 …
         $queries = array_filter( $queries );
+    }
     /**
+    /**
      * Filter the dbDelta SQL queries.
+     *
 …
+        }
+    }
     /**
+    /**
      * Filter the dbDelta SQL queries for creating tables and/or databases.
+     *
      * Queries filterable via this hook contain "CREATE TABLE" or "CREATE DATABASE".
+     *
+     *
      * @since 3.3.0
+     *
 …
     $cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
     /**
+    /**
      * Filter the dbDelta SQL queries for inserting or updating.
+     *
      * Queries filterable via this hook contain "INSERT INTO" or "UPDATE".
+     *
+     *
      * @since 3.3.0
+     *
 …
  */
 function make_db_current_silent( $tables = 'all' ) {
     $alterations = dbDelta( $tables );
+    dbDelta( $tables );
+}

Note: See TracChangeset for help on using the changeset viewer.