Changes from branches/3.5/wp-admin/includes/schema.php at r24614 to branches/3.6/wp-admin/includes/schema.php at r24974

File:

• branches/3.6/wp-admin/includes/schema.php (modified) (18 diffs)

branches/3.6/wp-admin/includes/schema.php

@@ -495 +495 @@
     $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
 
-    $existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options");
+    $keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
+    $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" );
 
     $insert = '';
@@ -506 +507 @@
             $autoload = 'yes';
 
-        $option = $wpdb->escape($option);
         if ( is_array($value) )
             $value = serialize($value);
-        $value = $wpdb->escape($value);
         if ( !empty($insert) )
             $insert .= ', ';
-        $insert .= "('$option', '$value', '$autoload')";
+        $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
     }
 
@@ -589 +588 @@
 
     // Add caps for Administrator role
-    $role =& get_role('administrator');
+    $role = get_role('administrator');
     $role->add_cap('switch_themes');
     $role->add_cap('edit_themes');
@@ -622 +621 @@
 
     // Add caps for Editor role
-    $role =& get_role('editor');
+    $role = get_role('editor');
     $role->add_cap('moderate_comments');
     $role->add_cap('manage_categories');
@@ -644 +643 @@
 
     // Add caps for Author role
-    $role =& get_role('author');
+    $role = get_role('author');
     $role->add_cap('upload_files');
     $role->add_cap('edit_posts');
@@ -655 +654 @@
 
     // Add caps for Contributor role
-    $role =& get_role('contributor');
+    $role = get_role('contributor');
     $role->add_cap('edit_posts');
     $role->add_cap('read');
@@ -662 +661 @@
 
     // Add caps for Subscriber role
-    $role =& get_role('subscriber');
+    $role = get_role('subscriber');
     $role->add_cap('read');
     $role->add_cap('level_0');
@@ -675 +674 @@
     $roles = array('administrator', 'editor');
     foreach ($roles as $role) {
-        $role =& get_role($role);
+        $role = get_role($role);
         if ( empty($role) )
             continue;
@@ -696 +695 @@
     }
 
-    $role =& get_role('administrator');
+    $role = get_role('administrator');
     if ( ! empty($role) ) {
         $role->add_cap('delete_users');
@@ -702 +701 @@
     }
 
-    $role =& get_role('author');
+    $role = get_role('author');
     if ( ! empty($role) ) {
         $role->add_cap('delete_posts');
@@ -708 +707 @@
     }
 
-    $role =& get_role('contributor');
+    $role = get_role('contributor');
     if ( ! empty($role) ) {
         $role->add_cap('delete_posts');
@@ -720 +719 @@
  */
 function populate_roles_230() {
-    $role =& get_role( 'administrator' );
+    $role = get_role( 'administrator' );
 
     if ( !empty( $role ) ) {
@@ -733 +732 @@
  */
 function populate_roles_250() {
-    $role =& get_role( 'administrator' );
+    $role = get_role( 'administrator' );
 
     if ( !empty( $role ) ) {
@@ -746 +745 @@
  */
 function populate_roles_260() {
-    $role =& get_role( 'administrator' );
+    $role = get_role( 'administrator' );
 
     if ( !empty( $role ) ) {
@@ -760 +759 @@
  */
 function populate_roles_270() {
-    $role =& get_role( 'administrator' );
+    $role = get_role( 'administrator' );
 
     if ( !empty( $role ) ) {
@@ -774 +773 @@
  */
 function populate_roles_280() {
-    $role =& get_role( 'administrator' );
+    $role = get_role( 'administrator' );
 
     if ( !empty( $role ) ) {
@@ -787 +786 @@
  */
 function populate_roles_300() {
-    $role =& get_role( 'administrator' );
+    $role = get_role( 'administrator' );
 
     if ( !empty( $role ) ) {
@@ -922 +921 @@
     $insert = '';
     foreach ( $sitemeta as $meta_key => $meta_value ) {
-        $meta_key = $wpdb->escape( $meta_key );
         if ( is_array( $meta_value ) )
             $meta_value = serialize( $meta_value );
-        $meta_value = $wpdb->escape( $meta_value );
         if ( !empty( $insert ) )
             $insert .= ', ';
-        $insert .= "( $network_id, '$meta_key', '$meta_value')";
+        $insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
     }
     $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );