Wordpress 4.6

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

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index b043e49b0cbcbad2ca23856404f6a0a01591f4da..83ba531794a4fc3e878d9f6062499ba9890209de 100644 (file)
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -36,12 +36,7 @@ $charset_collate = $wpdb->get_charset_collate();
 function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
        global $wpdb;
 
 function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
        global $wpdb;
 

-       $charset_collate = '';
-
-       if ( ! empty($wpdb->charset) )
-               $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-       if ( ! empty($wpdb->collate) )
-               $charset_collate .= " COLLATE $wpdb->collate";
+       $charset_collate = $wpdb->get_charset_collate();

 
        if ( $blog_id && $blog_id != $wpdb->blogid )
                $old_blog_id = $wpdb->set_blog_id( $blog_id );
 
        if ( $blog_id && $blog_id != $wpdb->blogid )
                $old_blog_id = $wpdb->set_blog_id( $blog_id );


@@ -386,7 +381,7 @@ function populate_options() {
        $timezone_string = '';
        $gmt_offset = 0;
        /* translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)
        $timezone_string = '';
        $gmt_offset = 0;
        /* translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)

-          or a valid timezone string (America/New_York). See http://us3.php.net/manual/en/timezones.php
+          or a valid timezone string (America/New_York). See https://secure.php.net/manual/en/timezones.php

           for all timezone strings supported by PHP.
        */
        $offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
           for all timezone strings supported by PHP.
        */
        $offset_or_tz = _x( '0', 'default GMT offset or timezone string' );


@@ -420,11 +415,11 @@ function populate_options() {
        'default_ping_status' => 'open',
        'default_pingback_flag' => 1,
        'posts_per_page' => 10,
        'default_ping_status' => 'open',
        'default_pingback_flag' => 1,
        'posts_per_page' => 10,

-       /* translators: default date format, see http://php.net/date */
+       /* translators: default date format, see https://secure.php.net/date */

        'date_format' => __('F j, Y'),
        'date_format' => __('F j, Y'),

-       /* translators: default time format, see http://php.net/date */
+       /* translators: default time format, see https://secure.php.net/date */

        'time_format' => __('g:i a'),
        'time_format' => __('g:i a'),

-       /* translators: links last updated date format, see http://php.net/date */
+       /* translators: links last updated date format, see https://secure.php.net/date */

        'links_updated_date_format' => __('F j, Y g:i a'),
        'comment_moderation' => 0,
        'moderation_notify' => 1,
        'links_updated_date_format' => __('F j, Y g:i a'),
        'comment_moderation' => 0,
        'moderation_notify' => 1,


@@ -1028,7 +1023,7 @@ We hope you enjoy your new site. Thanks!
                $sitemeta['illegal_names'][] = 'blog';
 
        /**
                $sitemeta['illegal_names'][] = 'blog';
 
        /**

-        * Filter meta for a network on creation.
+        * Filters meta for a network on creation.

         *
         * @since 3.7.0
         *
         *
         * @since 3.7.0
         *