WordPress 3.7.2

[autoinstalls/wordpress.git] / wp-admin / includes / schema.php

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index f042fdd4066071a368f74c4b970023760efb1681..f88f79d0528275581a72c96b8467952e6a23e273 100644 (file)
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -230,7 +230,7 @@ CREATE TABLE $wpdb->posts (
   registered datetime NOT NULL default '0000-00-00 00:00:00',
   last_updated datetime NOT NULL default '0000-00-00 00:00:00',
   public tinyint(2) NOT NULL default '1',
   registered datetime NOT NULL default '0000-00-00 00:00:00',
   last_updated datetime NOT NULL default '0000-00-00 00:00:00',
   public tinyint(2) NOT NULL default '1',

-  archived enum('0','1') NOT NULL default '0',
+  archived tinyint(2) NOT NULL default '0',

   mature tinyint(2) NOT NULL default '0',
   spam tinyint(2) NOT NULL default '0',
   deleted tinyint(2) NOT NULL default '0',
   mature tinyint(2) NOT NULL default '0',
   spam tinyint(2) NOT NULL default '0',
   deleted tinyint(2) NOT NULL default '0',


@@ -272,6 +272,7 @@ CREATE TABLE $wpdb->sitemeta (
   KEY site_id (site_id)
 ) $charset_collate;
 CREATE TABLE $wpdb->signups (
   KEY site_id (site_id)
 ) $charset_collate;
 CREATE TABLE $wpdb->signups (

+  signup_id bigint(20) NOT NULL auto_increment,

   domain varchar(200) NOT NULL default '',
   path varchar(100) NOT NULL default '',
   title longtext NOT NULL,
   domain varchar(200) NOT NULL default '',
   path varchar(100) NOT NULL default '',
   title longtext NOT NULL,


@@ -282,8 +283,11 @@ CREATE TABLE $wpdb->signups (
   active tinyint(1) NOT NULL default '0',
   activation_key varchar(50) NOT NULL default '',
   meta longtext,
   active tinyint(1) NOT NULL default '0',
   activation_key varchar(50) NOT NULL default '',
   meta longtext,

+  PRIMARY KEY  (signup_id),

   KEY activation_key (activation_key),
   KEY activation_key (activation_key),

-  KEY domain (domain)
+  KEY user_email (user_email),
+  KEY user_login_email (user_login,user_email),
+  KEY domain_path (domain,path)

 ) $charset_collate;";
 
        switch ( $scope ) {
 ) $charset_collate;";
 
        switch ( $scope ) {


@@ -494,7 +498,8 @@ function populate_options() {
        // Set autoload to no for these options
        $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
 
        // Set autoload to no for these options
        $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 = '';
        foreach ( $options as $option => $value ) {
 
        $insert = '';
        foreach ( $options as $option => $value ) {


@@ -505,13 +510,11 @@ function populate_options() {
                else
                        $autoload = 'yes';
 
                else
                        $autoload = 'yes';
 

-               $option = $wpdb->escape($option);

                if ( is_array($value) )
                        $value = serialize($value);
                if ( is_array($value) )
                        $value = serialize($value);

-               $value = $wpdb->escape($value);

                if ( !empty($insert) )
                        $insert .= ', ';
                if ( !empty($insert) )
                        $insert .= ', ';

-               $insert .= "('$option', '$value', '$autoload')";
+               $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );

        }
 
        if ( !empty($insert) )
        }
 
        if ( !empty($insert) )


@@ -543,6 +546,24 @@ function populate_options() {
 
        // delete obsolete magpie stuff
        $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
 
        // delete obsolete magpie stuff
        $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");

+
+       // Deletes all expired transients.
+       // The multi-table delete syntax is used to delete the transient record from table a,
+       // and the corresponding transient_timeout record from table b.
+       $time = time();
+       $wpdb->query("DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE
+               a.option_name LIKE '\_transient\_%' AND
+               a.option_name NOT LIKE '\_transient\_timeout\_%' AND
+               b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
+               AND b.option_value < $time");
+
+       if ( is_main_site() && is_main_network() ) {
+               $wpdb->query("DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE
+                       a.option_name LIKE '\_site\_transient\_%' AND
+                       a.option_name NOT LIKE '\_site\_transient\_timeout\_%' AND
+                       b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
+                       AND b.option_value < $time");
+    }

 }
 
 /**
 }
 
 /**


@@ -588,7 +609,7 @@ function populate_roles_160() {
        add_role('subscriber', 'Subscriber');
 
        // Add caps for Administrator role
        add_role('subscriber', 'Subscriber');
 
        // Add caps for Administrator role

-       $role =& get_role('administrator');
+       $role = get_role('administrator');

        $role->add_cap('switch_themes');
        $role->add_cap('edit_themes');
        $role->add_cap('activate_plugins');
        $role->add_cap('switch_themes');
        $role->add_cap('edit_themes');
        $role->add_cap('activate_plugins');


@@ -621,7 +642,7 @@ function populate_roles_160() {
        $role->add_cap('level_0');
 
        // Add caps for Editor role
        $role->add_cap('level_0');
 
        // Add caps for Editor role

-       $role =& get_role('editor');
+       $role = get_role('editor');

        $role->add_cap('moderate_comments');
        $role->add_cap('manage_categories');
        $role->add_cap('manage_links');
        $role->add_cap('moderate_comments');
        $role->add_cap('manage_categories');
        $role->add_cap('manage_links');


@@ -643,7 +664,7 @@ function populate_roles_160() {
        $role->add_cap('level_0');
 
        // Add caps for Author role
        $role->add_cap('level_0');
 
        // Add caps for Author role

-       $role =& get_role('author');
+       $role = get_role('author');

        $role->add_cap('upload_files');
        $role->add_cap('edit_posts');
        $role->add_cap('edit_published_posts');
        $role->add_cap('upload_files');
        $role->add_cap('edit_posts');
        $role->add_cap('edit_published_posts');


@@ -654,14 +675,14 @@ function populate_roles_160() {
        $role->add_cap('level_0');
 
        // Add caps for Contributor role
        $role->add_cap('level_0');
 
        // Add caps for Contributor role

-       $role =& get_role('contributor');
+       $role = get_role('contributor');

        $role->add_cap('edit_posts');
        $role->add_cap('read');
        $role->add_cap('level_1');
        $role->add_cap('level_0');
 
        // Add caps for Subscriber role
        $role->add_cap('edit_posts');
        $role->add_cap('read');
        $role->add_cap('level_1');
        $role->add_cap('level_0');
 
        // Add caps for Subscriber role

-       $role =& get_role('subscriber');
+       $role = get_role('subscriber');

        $role->add_cap('read');
        $role->add_cap('level_0');
 }
        $role->add_cap('read');
        $role->add_cap('level_0');
 }


@@ -674,7 +695,7 @@ function populate_roles_160() {
 function populate_roles_210() {
        $roles = array('administrator', 'editor');
        foreach ($roles as $role) {
 function populate_roles_210() {
        $roles = array('administrator', 'editor');
        foreach ($roles as $role) {

-               $role =& get_role($role);
+               $role = get_role($role);

                if ( empty($role) )
                        continue;
 
                if ( empty($role) )
                        continue;
 


@@ -695,19 +716,19 @@ function populate_roles_210() {
                $role->add_cap('read_private_pages');
        }
 
                $role->add_cap('read_private_pages');
        }
 

-       $role =& get_role('administrator');
+       $role = get_role('administrator');

        if ( ! empty($role) ) {
                $role->add_cap('delete_users');
                $role->add_cap('create_users');
        }
 
        if ( ! empty($role) ) {
                $role->add_cap('delete_users');
                $role->add_cap('create_users');
        }
 

-       $role =& get_role('author');
+       $role = get_role('author');

        if ( ! empty($role) ) {
                $role->add_cap('delete_posts');
                $role->add_cap('delete_published_posts');
        }
 
        if ( ! empty($role) ) {
                $role->add_cap('delete_posts');
                $role->add_cap('delete_published_posts');
        }
 

-       $role =& get_role('contributor');
+       $role = get_role('contributor');

        if ( ! empty($role) ) {
                $role->add_cap('delete_posts');
        }
        if ( ! empty($role) ) {
                $role->add_cap('delete_posts');
        }


@@ -719,7 +740,7 @@ function populate_roles_210() {
  * @since 2.3.0
  */
 function populate_roles_230() {
  * @since 2.3.0
  */
 function populate_roles_230() {

-       $role =& get_role( 'administrator' );
+       $role = get_role( 'administrator' );

 
        if ( !empty( $role ) ) {
                $role->add_cap( 'unfiltered_upload' );
 
        if ( !empty( $role ) ) {
                $role->add_cap( 'unfiltered_upload' );


@@ -732,7 +753,7 @@ function populate_roles_230() {
  * @since 2.5.0
  */
 function populate_roles_250() {
  * @since 2.5.0
  */
 function populate_roles_250() {

-       $role =& get_role( 'administrator' );
+       $role = get_role( 'administrator' );

 
        if ( !empty( $role ) ) {
                $role->add_cap( 'edit_dashboard' );
 
        if ( !empty( $role ) ) {
                $role->add_cap( 'edit_dashboard' );


@@ -745,7 +766,7 @@ function populate_roles_250() {
  * @since 2.6.0
  */
 function populate_roles_260() {
  * @since 2.6.0
  */
 function populate_roles_260() {

-       $role =& get_role( 'administrator' );
+       $role = get_role( 'administrator' );

 
        if ( !empty( $role ) ) {
                $role->add_cap( 'update_plugins' );
 
        if ( !empty( $role ) ) {
                $role->add_cap( 'update_plugins' );


@@ -759,7 +780,7 @@ function populate_roles_260() {
  * @since 2.7.0
  */
 function populate_roles_270() {
  * @since 2.7.0
  */
 function populate_roles_270() {

-       $role =& get_role( 'administrator' );
+       $role = get_role( 'administrator' );

 
        if ( !empty( $role ) ) {
                $role->add_cap( 'install_plugins' );
 
        if ( !empty( $role ) ) {
                $role->add_cap( 'install_plugins' );


@@ -773,7 +794,7 @@ function populate_roles_270() {
  * @since 2.8.0
  */
 function populate_roles_280() {
  * @since 2.8.0
  */
 function populate_roles_280() {

-       $role =& get_role( 'administrator' );
+       $role = get_role( 'administrator' );

 
        if ( !empty( $role ) ) {
                $role->add_cap( 'install_themes' );
 
        if ( !empty( $role ) ) {
                $role->add_cap( 'install_themes' );


@@ -786,7 +807,7 @@ function populate_roles_280() {
  * @since 3.0.0
  */
 function populate_roles_300() {
  * @since 3.0.0
  */
 function populate_roles_300() {

-       $role =& get_role( 'administrator' );
+       $role = get_role( 'administrator' );

 
        if ( !empty( $role ) ) {
                $role->add_cap( 'update_core' );
 
        if ( !empty( $role ) ) {
                $role->add_cap( 'update_core' );


@@ -919,15 +940,23 @@ We hope you enjoy your new site. Thanks!
        if ( ! $subdomain_install )
                $sitemeta['illegal_names'][] = 'blog';
 
        if ( ! $subdomain_install )
                $sitemeta['illegal_names'][] = 'blog';
 

+       /**
+        * Filter meta for a network on creation.
+        *
+        * @since 3.7.0
+        *
+        * @param array $sitemeta Associative of meta keys and values to be inserted.
+        * @param int $network_id Network ID being created.
+        */
+       $sitemeta = apply_filters( 'populate_network_meta', $sitemeta, $network_id );
+

        $insert = '';
        foreach ( $sitemeta as $meta_key => $meta_value ) {
        $insert = '';
        foreach ( $sitemeta as $meta_key => $meta_value ) {

-               $meta_key = $wpdb->escape( $meta_key );

                if ( is_array( $meta_value ) )
                        $meta_value = serialize( $meta_value );
                if ( is_array( $meta_value ) )
                        $meta_value = serialize( $meta_value );

-               $meta_value = $wpdb->escape( $meta_value );

                if ( !empty( $insert ) )
                        $insert .= ', ';
                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 );
 
        }
        $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
 


@@ -939,7 +968,7 @@ We hope you enjoy your new site. Thanks!
                $current_site->domain = $domain;
                $current_site->path = $path;
                $current_site->site_name = ucfirst( $domain );
                $current_site->domain = $domain;
                $current_site->path = $path;
                $current_site->site_name = ucfirst( $domain );

-               $wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
+               $wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );

                $current_site->blog_id = $blog_id = $wpdb->insert_id;
                update_user_meta( $site_user->ID, 'source_domain', $domain );
                update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
                $current_site->blog_id = $blog_id = $wpdb->insert_id;
                update_user_meta( $site_user->ID, 'source_domain', $domain );
                update_user_meta( $site_user->ID, 'primary_blog', $blog_id );


@@ -950,9 +979,10 @@ We hope you enjoy your new site. Thanks!
                        $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
 
                flush_rewrite_rules();
                        $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
 
                flush_rewrite_rules();

-       }

 
 

-       if ( $subdomain_install ) {
+               if ( ! $subdomain_install )
+                       return true;
+

                $vhost_ok = false;
                $errstr = '';
                $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
                $vhost_ok = false;
                $errstr = '';
                $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!