Changeset 25986 for trunk

Timestamp:

10/29/2013 08:05:16 PM (12 years ago)

Author:

nacin

Message:

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

Location:

trunk/src/wp-includes

Files:

• default-constants.php (modified) (1 diff)
• l10n.php (modified) (1 diff)

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

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