WordPress.org

Make WordPress Core

Changeset 29311


Ignore:
Timestamp:
07/27/2014 05:45:34 PM (6 years ago)
Author:
ocean90
Message:

Replace is_https_url() with 'https' === parse_url( $url, PHP_URL_SCHEME ).

see #28427, #28487.

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/comment.php

    r29165 r29311  
    736736     */
    737737    $comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
    738     $secure = is_https_url( home_url() );
     738    $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
    739739    setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
    740740    setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
  • trunk/src/wp-includes/option.php

    r28895 r29311  
    747747
    748748    // The cookie is not set in the current browser or the saved value is newer.
    749     $secure = is_https_url( site_url() );
     749    $secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) );
    750750    setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
    751751    setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
  • trunk/src/wp-login.php

    r29258 r29311  
    428428
    429429//Set a cookie now to see if they are supported by the browser.
    430 $secure = ( is_https_url( home_url() ) && is_https_url( site_url() ) );
     430$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
    431431setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
    432432if ( SITECOOKIEPATH != COOKIEPATH )
     
    470470     */
    471471    $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
    472     $secure = is_https_url( home_url() );
     472    $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
    473473    setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
    474474
Note: See TracChangeset for help on using the changeset viewer.