Changeset 29311

Timestamp:

07/27/2014 05:45:34 PM (11 years ago)

Author:

ocean90

Message:

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

see #28427, #28487.

Location:

trunk/src

Files:

• wp-includes/comment.php (modified) (1 diff)
• wp-includes/option.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -736 +736 @@
      */
     $comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
-    $secure = is_https_url( home_url() );
+    $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
     setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
     setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );

trunk/src/wp-includes/option.php

@@ -747 +747 @@
 
     // The cookie is not set in the current browser or the saved value is newer.
-    $secure = is_https_url( site_url() );
+    $secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) );
     setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
     setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );

trunk/src/wp-login.php

@@ -428 +428 @@
 
 //Set a cookie now to see if they are supported by the browser.
-$secure = ( is_https_url( home_url() ) && is_https_url( site_url() ) );
+$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
 setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
 if ( SITECOOKIEPATH != COOKIEPATH )
@@ -470 +470 @@
      */
     $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
-    $secure = is_https_url( home_url() );
+    $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
     setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );