Ticket #25760: 25760.2.diff

src/wp-includes/default-constants.php

@@ -42 +42 @@
         if ( function_exists( 'memory_get_usage' ) ) {
                 $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;
 
                 if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || $current_limit_int < $wp_limit_int ) )

src/wp-includes/l10n.php

@@ -797 +797 @@
                 'Project-Id-Version' => '"Project-Id-Version',
                 '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;
 }