Changes in branches/3.7/src [25914:25987]

Location:

branches/3.7/src

Files:

• wp-admin/about.php (modified) (3 diffs)
• wp-admin/credits.php (modified) (1 diff)
• wp-admin/freedoms.php (modified) (1 diff)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-admin/includes/update.php (modified) (2 diffs)
• wp-admin/update-core.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/default-constants.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (modified) (1 diff)
• wp-includes/l10n.php (modified) (1 diff)
• wp-includes/option.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/update.php (modified) (4 diffs)
• wp-includes/user.php (modified) (1 diff)
• wp-includes/version.php (modified) (2 diffs)

branches/3.7/src/wp-admin/about.php

@@ -22 +22 @@
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating to WordPress 3.7! You might not notice a thing, and we&#8217;re okay with that.' ), $display_version ); ?></div>
+<div class="about-text"><?php echo str_replace( '3.7', $display_version, __( 'Thank you for updating to WordPress 3.7! You might not notice a thing, and we&#8217;re okay with that.' ) ); ?></div>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
@@ -35 +35 @@
     </a>
 </h2>
+
+<div class="changelog point-releases">
+    <h3><?php echo _n( 'Maintenance Release', 'Maintenance Releases', 1 ); ?></h3>
+    <p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
+        '<strong>Version %1$s</strong> addressed %2$s bugs.', 11 ), '3.7.1', number_format_i18n( 11 ) ); ?>
+        <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.7.1' ); ?>
+    </p>
+</div>
 
 <div class="changelog">
@@ -62 +70 @@
             require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
             $updater = new WP_Automatic_Updater;
-            $can_auto_update = wp_http_supports( 'ssl' ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
+            $can_auto_update = wp_http_supports( array( 'ssl' ) ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
 
             if ( $can_auto_update ) {

branches/3.7/src/wp-admin/credits.php

@@ -82 +82 @@
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating to WordPress 3.7! You might not notice a thing, and we&#8217;re okay with that.' ), $display_version ); ?></div>
+<div class="about-text"><?php echo str_replace( '3.7', $display_version, __( 'Thank you for updating to WordPress 3.7! You might not notice a thing, and we&#8217;re okay with that.' ) ); ?></div>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

branches/3.7/src/wp-admin/freedoms.php

@@ -20 +20 @@
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating to WordPress 3.7! You might not notice a thing, and we&#8217;re okay with that.' ), $display_version ); ?></div>
+<div class="about-text"><?php echo str_replace( '3.7', $display_version, __( 'Thank you for updating to WordPress 3.7! You might not notice a thing, and we&#8217;re okay with that.' ) ); ?></div>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

branches/3.7/src/wp-admin/includes/class-wp-upgrader.php

@@ -2136 +2136 @@
         if ( ! $next_user_core_update )
             $next_user_core_update = $core_update;
-        $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update, '>' ) );
+        $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
 
         /**

branches/3.7/src/wp-admin/includes/plugin-install.php

@@ -61 +61 @@
 
     if ( false === $res ) {
-        $url = 'http://api.wordpress.org/plugins/info/1.0/';
-        if ( wp_http_supports( array( 'ssl' ) ) )
+        $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
+        if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
             $url = set_url_scheme( $url, 'https' );
 
-        $request = wp_remote_post( $url, array(
+        $args = array(
             'timeout' => 15,
             'body' => array(
@@ -71 +71 @@
                 'request' => serialize( $args )
             )
-        ) );
+        );
+        $request = wp_remote_post( $url, $args );
+
+        if ( $ssl && is_wp_error( $request ) ) {
+            trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+            $request = wp_remote_post( $http_url, $args );
+        }
 
         if ( is_wp_error($request) ) {

branches/3.7/src/wp-admin/includes/theme.php

@@ -283 +283 @@
 
     if ( ! $res ) {
-        $url = 'http://api.wordpress.org/themes/info/1.0/';
-        if ( wp_http_supports( array( 'ssl' ) ) )
+        $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
+        if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
             $url = set_url_scheme( $url, 'https' );
 
-        $request = wp_remote_post( $url, array(
+        $args = array(
             'body' => array(
                 'action' => $action,
                 'request' => serialize( $args )
             )
-        ) );
+        );
+        $request = wp_remote_post( $url, $args );
+
+        if ( $ssl && is_wp_error( $request ) ) {
+            trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+            $request = wp_remote_post( $http_url, $args );
+        }
 
         if ( is_wp_error($request) ) {

branches/3.7/src/wp-admin/includes/update-core.php

@@ -751 +751 @@
     $skip = array( 'wp-content' );
     $failed = array();
-    if ( is_array( $checksums ) ) {
+    if ( isset( $checksums ) && is_array( $checksums ) ) {
         foreach ( $checksums as $file => $checksum ) {
             if ( 0 === strpos( $file, 'wp-content' ) )

branches/3.7/src/wp-admin/includes/update.php

@@ -104 +104 @@
     $return = array();
 
-    $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
-
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
+
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
@@ -114 +114 @@
 
     $response = wp_remote_get( $url, $options );
+    if ( $ssl && is_wp_error( $response ) ) {
+        trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $response = wp_remote_get( $http_url, $options );
+    }
 
     if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )

branches/3.7/src/wp-admin/update-core.php

@@ -147 +147 @@
         _e('You have the latest version of WordPress.');
 
-        if ( wp_http_supports( 'ssl' ) ) {
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
             require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
             $upgrader = new WP_Automatic_Updater;

branches/3.7/src/wp-includes/category-template.php

@@ -233 +233 @@
  */
 function in_category( $category, $post = null ) {
+    if ( empty( $category ) )
+        return false;
+
     return has_category( $category, $post );
 }

branches/3.7/src/wp-includes/default-constants.php

@@ -43 +43 @@
         $current_limit = @ini_get( 'memory_limit' );
         $current_limit_int = intval( $current_limit );
-        if ( false !== stripos( $current_limit, 'G' ) )
+        if ( false !== strpos( $current_limit, 'G' ) )
             $current_limit_int *= 1024;
         $wp_limit_int = intval( WP_MEMORY_LIMIT );
-        if ( false !== stripos( WP_MEMORY_LIMIT, 'G' ) )
+        if ( false !== strpos( WP_MEMORY_LIMIT, 'G' ) )
             $wp_limit_int *= 1024;
 

branches/3.7/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js

@@ -161 +161 @@
                     div_cls += ' mceIEcenter';
 
-                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+( 10 + parseInt(w) )+
+                w = parseInt( w, 10 ) + 10;
+                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+w+
                 'px"><dt class="wp-caption-dt">'+img+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
             });

branches/3.7/src/wp-includes/l10n.php

@@ -798 +798 @@
         'X-Generator'        => '"X-Generator',
     ) );
-    foreach ( $headers as &$header ) {
+    foreach ( $headers as $header => $value ) {
         // Remove possible contextual '\n' and closing double quote.
-        $header = preg_replace( '~(\\\n)?"$~', '', $header );
+        $headers[ $header ] = preg_replace( '~(\\\n)?"$~', '', $value );
     }
     return $headers;

branches/3.7/src/wp-includes/option.php

@@ -237 +237 @@
     $serialized_value = maybe_serialize( $value );
 
+    do_action( 'update_option', $option, $old_value, $value );
     $result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) );
     if ( ! $result )
@@ -247 +248 @@
     }
 
-    do_action( 'update_option', $option, $old_value, $value );
     if ( ! defined( 'WP_INSTALLING' ) ) {
         $alloptions = wp_load_alloptions();

branches/3.7/src/wp-includes/post.php

@@ -3707 +3707 @@
         return $pages;
 
-    if ( $parent && ! $child_of )
+    if ( $parent > 0 && ! $child_of )
         $hierarchical = false;
 

branches/3.7/src/wp-includes/query.php

@@ -1987 +1987 @@
                 $term = trim( $term, "\"' " );
 
-            // \p{L} matches a single letter that is not a Chinese, Japanese, etc. char
-            if ( ! $term || preg_match( '/^\p{L}$/u', $term ) )
+            // Avoid single A-Z.
+            if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z]$/i', $term ) ) )
                 continue;
 

branches/3.7/src/wp-includes/taxonomy.php

@@ -1363 +1363 @@
     if ( ! empty( $exclude_tree ) ) {
         $exclude_tree = wp_parse_id_list( $exclude_tree );
-        $excluded_children = array();
+        $excluded_children = $exclude_tree;
         foreach ( $exclude_tree as $extrunk ) {
             $excluded_children = array_merge(

branches/3.7/src/wp-includes/update.php

@@ -94 +94 @@
         $post_body = array_merge( $post_body, $extra_stats );
 
-    $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
@@ -109 +109 @@
 
     $response = wp_remote_post( $url, $options );
+    if ( $ssl && is_wp_error( $response ) ) {
+        trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $response = wp_remote_post( $http_url, $options );
+    }
 
     if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
@@ -247 +251 @@
     );
 
-    $url = 'http://api.wordpress.org/plugins/update-check/1.1/';
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
     $raw_response = wp_remote_post( $url, $options );
+    if ( $ssl && is_wp_error( $raw_response ) ) {
+        trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $raw_response = wp_remote_post( $http_url, $options );
+    }
 
     if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
@@ -383 +391 @@
     );
 
-    $url = 'http://api.wordpress.org/themes/update-check/1.1/';
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
     $raw_response = wp_remote_post( $url, $options );
+    if ( $ssl && is_wp_error( $raw_response ) ) {
+        trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $raw_response = wp_remote_post( $http_url, $options );
+    }
 
     if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )

branches/3.7/src/wp-includes/user.php

@@ -213 +213 @@
  */
 function get_current_user_id() {
+    if ( ! function_exists( 'wp_get_current_user' ) )
+        return 0;
     $user = wp_get_current_user();
     return ( isset( $user->ID ) ? (int) $user->ID : 0 );

branches/3.7/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.7.1-alpha-src';
+$wp_version = '3.7.1-src';
 
 /**
@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '359-20131018';
+$tinymce_version = '359-20131026';
 
 /**