Changeset 25987 for branches/3.7

Timestamp:

10/29/2013 08:07:04 PM (11 years ago)

Author:

nacin

Message:

PHP4 compatibility for files loaded before we bail. fixes #25760.

Merges [25986] to the 3.7 branch.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-admin/about.php (modified) (1 diff)
• src/wp-includes/default-constants.php (modified) (1 diff)
• src/wp-includes/l10n.php (modified) (1 diff)

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

@@ -39 +39 @@
     <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.', 10 ), '3.7.1', number_format_i18n( 10 ) ); ?>
+        '<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>

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/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;