WordPress.org

Make WordPress Core


Ignore:
Location:
branches/3.7/src
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • branches/3.7/src/wp-admin/about.php

    r25987 r25914  
    2222<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
    2323
    24 <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>
     24<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>
    2525
    2626<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
     
    3535    </a>
    3636</h2>
    37 
    38 <div class="changelog point-releases">
    39     <h3><?php echo _n( 'Maintenance Release', 'Maintenance Releases', 1 ); ?></h3>
    40     <p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
    41         '<strong>Version %1$s</strong> addressed %2$s bugs.', 11 ), '3.7.1', number_format_i18n( 11 ) ); ?>
    42         <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.7.1' ); ?>
    43     </p>
    44 </div>
    4537
    4638<div class="changelog">
     
    7062            require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    7163            $updater = new WP_Automatic_Updater;
    72             $can_auto_update = wp_http_supports( array( 'ssl' ) ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
     64            $can_auto_update = wp_http_supports( 'ssl' ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
    7365
    7466            if ( $can_auto_update ) {
  • branches/3.7/src/wp-admin/credits.php

    r25987 r25914  
    8282<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
    8383
    84 <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>
     84<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>
    8585
    8686<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
  • branches/3.7/src/wp-admin/freedoms.php

    r25987 r25914  
    2020<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
    2121
    22 <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>
     22<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>
    2323
    2424<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
  • branches/3.7/src/wp-admin/includes/class-wp-upgrader.php

    r25987 r25914  
    21362136        if ( ! $next_user_core_update )
    21372137            $next_user_core_update = $core_update;
    2138         $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
     2138        $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update, '>' ) );
    21392139
    21402140        /**
  • branches/3.7/src/wp-admin/includes/plugin-install.php

    r25987 r25914  
    6161
    6262    if ( false === $res ) {
    63         $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
    64         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
     63        $url = 'http://api.wordpress.org/plugins/info/1.0/';
     64        if ( wp_http_supports( array( 'ssl' ) ) )
    6565            $url = set_url_scheme( $url, 'https' );
    6666
    67         $args = array(
     67        $request = wp_remote_post( $url, array(
    6868            'timeout' => 15,
    6969            'body' => array(
     
    7171                'request' => serialize( $args )
    7272            )
    73         );
    74         $request = wp_remote_post( $url, $args );
    75 
    76         if ( $ssl && is_wp_error( $request ) ) {
    77             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 );
    78             $request = wp_remote_post( $http_url, $args );
    79         }
     73        ) );
    8074
    8175        if ( is_wp_error($request) ) {
  • branches/3.7/src/wp-admin/includes/theme.php

    r25987 r25914  
    283283
    284284    if ( ! $res ) {
    285         $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
    286         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
     285        $url = 'http://api.wordpress.org/themes/info/1.0/';
     286        if ( wp_http_supports( array( 'ssl' ) ) )
    287287            $url = set_url_scheme( $url, 'https' );
    288288
    289         $args = array(
     289        $request = wp_remote_post( $url, array(
    290290            'body' => array(
    291291                'action' => $action,
    292292                'request' => serialize( $args )
    293293            )
    294         );
    295         $request = wp_remote_post( $url, $args );
    296 
    297         if ( $ssl && is_wp_error( $request ) ) {
    298             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 );
    299             $request = wp_remote_post( $http_url, $args );
    300         }
     294        ) );
    301295
    302296        if ( is_wp_error($request) ) {
  • branches/3.7/src/wp-admin/includes/update-core.php

    r25987 r25914  
    751751    $skip = array( 'wp-content' );
    752752    $failed = array();
    753     if ( isset( $checksums ) && is_array( $checksums ) ) {
     753    if ( is_array( $checksums ) ) {
    754754        foreach ( $checksums as $file => $checksum ) {
    755755            if ( 0 === strpos( $file, 'wp-content' ) )
  • branches/3.7/src/wp-admin/includes/update.php

    r25987 r25914  
    104104    $return = array();
    105105
    106     $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
    107 
    108     if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
     106    $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
     107
     108    if ( wp_http_supports( array( 'ssl' ) ) )
    109109        $url = set_url_scheme( $url, 'https' );
    110110
     
    114114
    115115    $response = wp_remote_get( $url, $options );
    116     if ( $ssl && is_wp_error( $response ) ) {
    117         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 );
    118         $response = wp_remote_get( $http_url, $options );
    119     }
    120116
    121117    if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
  • branches/3.7/src/wp-admin/update-core.php

    r25987 r25914  
    147147        _e('You have the latest version of WordPress.');
    148148
    149         if ( wp_http_supports( array( 'ssl' ) ) ) {
     149        if ( wp_http_supports( 'ssl' ) ) {
    150150            require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    151151            $upgrader = new WP_Automatic_Updater;
  • branches/3.7/src/wp-includes/category-template.php

    r25987 r25914  
    233233 */
    234234function in_category( $category, $post = null ) {
    235     if ( empty( $category ) )
    236         return false;
    237 
    238235    return has_category( $category, $post );
    239236}
  • branches/3.7/src/wp-includes/default-constants.php

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

    r25987 r25914  
    161161                    div_cls += ' mceIEcenter';
    162162
    163                 w = parseInt( w, 10 ) + 10;
    164                 return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+w+
     163                return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+( 10 + parseInt(w) )+
    165164                'px"><dt class="wp-caption-dt">'+img+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
    166165            });
  • branches/3.7/src/wp-includes/l10n.php

    r25987 r25914  
    798798        'X-Generator'        => '"X-Generator',
    799799    ) );
    800     foreach ( $headers as $header => $value ) {
     800    foreach ( $headers as &$header ) {
    801801        // Remove possible contextual '\n' and closing double quote.
    802         $headers[ $header ] = preg_replace( '~(\\\n)?"$~', '', $value );
     802        $header = preg_replace( '~(\\\n)?"$~', '', $header );
    803803    }
    804804    return $headers;
  • branches/3.7/src/wp-includes/option.php

    r25987 r25914  
    237237    $serialized_value = maybe_serialize( $value );
    238238
    239     do_action( 'update_option', $option, $old_value, $value );
    240239    $result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) );
    241240    if ( ! $result )
     
    248247    }
    249248
     249    do_action( 'update_option', $option, $old_value, $value );
    250250    if ( ! defined( 'WP_INSTALLING' ) ) {
    251251        $alloptions = wp_load_alloptions();
  • branches/3.7/src/wp-includes/post.php

    r25987 r25914  
    37073707        return $pages;
    37083708
    3709     if ( $parent > 0 && ! $child_of )
     3709    if ( $parent && ! $child_of )
    37103710        $hierarchical = false;
    37113711
  • branches/3.7/src/wp-includes/query.php

    r25987 r25914  
    19871987                $term = trim( $term, "\"' " );
    19881988
    1989             // Avoid single A-Z.
    1990             if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z]$/i', $term ) ) )
     1989            // \p{L} matches a single letter that is not a Chinese, Japanese, etc. char
     1990            if ( ! $term || preg_match( '/^\p{L}$/u', $term ) )
    19911991                continue;
    19921992
  • branches/3.7/src/wp-includes/taxonomy.php

    r25987 r25914  
    13631363    if ( ! empty( $exclude_tree ) ) {
    13641364        $exclude_tree = wp_parse_id_list( $exclude_tree );
    1365         $excluded_children = $exclude_tree;
     1365        $excluded_children = array();
    13661366        foreach ( $exclude_tree as $extrunk ) {
    13671367            $excluded_children = array_merge(
  • branches/3.7/src/wp-includes/update.php

    r25987 r25914  
    9494        $post_body = array_merge( $post_body, $extra_stats );
    9595
    96     $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
    97     if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
     96    $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
     97    if ( wp_http_supports( array( 'ssl' ) ) )
    9898        $url = set_url_scheme( $url, 'https' );
    9999
     
    109109
    110110    $response = wp_remote_post( $url, $options );
    111     if ( $ssl && is_wp_error( $response ) ) {
    112         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 );
    113         $response = wp_remote_post( $http_url, $options );
    114     }
    115111
    116112    if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
     
    251247    );
    252248
    253     $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
    254     if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
     249    $url = 'http://api.wordpress.org/plugins/update-check/1.1/';
     250    if ( wp_http_supports( array( 'ssl' ) ) )
    255251        $url = set_url_scheme( $url, 'https' );
    256252
    257253    $raw_response = wp_remote_post( $url, $options );
    258     if ( $ssl && is_wp_error( $raw_response ) ) {
    259         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 );
    260         $raw_response = wp_remote_post( $http_url, $options );
    261     }
    262254
    263255    if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
     
    391383    );
    392384
    393     $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
    394     if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
     385    $url = 'http://api.wordpress.org/themes/update-check/1.1/';
     386    if ( wp_http_supports( array( 'ssl' ) ) )
    395387        $url = set_url_scheme( $url, 'https' );
    396388
    397389    $raw_response = wp_remote_post( $url, $options );
    398     if ( $ssl && is_wp_error( $raw_response ) ) {
    399         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 );
    400         $raw_response = wp_remote_post( $http_url, $options );
    401     }
    402390
    403391    if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
  • branches/3.7/src/wp-includes/user.php

    r25987 r25914  
    213213 */
    214214function get_current_user_id() {
    215     if ( ! function_exists( 'wp_get_current_user' ) )
    216         return 0;
    217215    $user = wp_get_current_user();
    218216    return ( isset( $user->ID ) ? (int) $user->ID : 0 );
  • branches/3.7/src/wp-includes/version.php

    r25987 r25914  
    55 * @global string $wp_version
    66 */
    7 $wp_version = '3.7.1-src';
     7$wp_version = '3.7.1-alpha-src';
    88
    99/**
     
    1919 * @global string $tinymce_version
    2020 */
    21 $tinymce_version = '359-20131026';
     21$tinymce_version = '359-20131018';
    2222
    2323/**
Note: See TracChangeset for help on using the changeset viewer.