Make WordPress Core

Changeset 25987 for branches/3.7


Ignore:
Timestamp:
10/29/2013 08:07:04 PM (10 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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/3.7

  • branches/3.7/src

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

    r25984 r25987  
    3939    <h3><?php echo _n( 'Maintenance Release', 'Maintenance Releases', 1 ); ?></h3>
    4040    <p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
    41         '<strong>Version %1$s</strong> addressed %2$s bugs.', 10 ), '3.7.1', number_format_i18n( 10 ) ); ?>
     41        '<strong>Version %1$s</strong> addressed %2$s bugs.', 11 ), '3.7.1', number_format_i18n( 11 ) ); ?>
    4242        <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.7.1' ); ?>
    4343    </p>
  • branches/3.7/src/wp-includes/default-constants.php

    r25685 r25987  
    4343        $current_limit = @ini_get( 'memory_limit' );
    4444        $current_limit_int = intval( $current_limit );
    45         if ( false !== stripos( $current_limit, 'G' ) )
     45        if ( false !== strpos( $current_limit, 'G' ) )
    4646            $current_limit_int *= 1024;
    4747        $wp_limit_int = intval( WP_MEMORY_LIMIT );
    48         if ( false !== stripos( WP_MEMORY_LIMIT, 'G' ) )
     48        if ( false !== strpos( WP_MEMORY_LIMIT, 'G' ) )
    4949            $wp_limit_int *= 1024;
    5050
  • branches/3.7/src/wp-includes/l10n.php

    r25652 r25987  
    798798        'X-Generator'        => '"X-Generator',
    799799    ) );
    800     foreach ( $headers as &$header ) {
     800    foreach ( $headers as $header => $value ) {
    801801        // Remove possible contextual '\n' and closing double quote.
    802         $header = preg_replace( '~(\\\n)?"$~', '', $header );
     802        $headers[ $header ] = preg_replace( '~(\\\n)?"$~', '', $value );
    803803    }
    804804    return $headers;
Note: See TracChangeset for help on using the changeset viewer.