<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45205] trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php: Bootstrap/Load: Remove `WP_Recovery_Mode_Cookie_Service` constructor to avoid referencing cookie constants before they are defined.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45205">45205</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45205","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-15 22:43:57 +0000 (Mon, 15 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Bootstrap/Load: Remove `WP_Recovery_Mode_Cookie_Service` constructor to avoid referencing cookie constants before they are defined.
Instantiating `WP_Recovery_Mode` should no longer have any required timing.
Props TimothyBlynJacobs, lkraav.
Fixes <a href="https://core.trac.wordpress.org/ticket/46882">#46882</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswprecoverymodecookieservicephp">trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswprecoverymodecookieservicephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php 2019-04-15 22:38:59 UTC (rev 45204)
+++ trunk/src/wp-includes/class-wp-recovery-mode-cookie-service.php 2019-04-15 22:43:57 UTC (rev 45205)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,69 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> final class WP_Recovery_Mode_Cookie_Service {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The cookie name to use.
- *
- * @since 5.2.0
- * @var string
- */
- private $name;
-
- /**
- * The domain the cookie should be set on, {@see setcookie()}.
- *
- * @since 5.2.0
- * @var string
- */
- private $domain;
-
- /**
- * The path to limit the cookie to, {@see setcookie()}.
- *
- * @since 5.2.0
- * @var string
- */
- private $path;
-
- /**
- * The path to use when the home_url and site_url are different.
- *
- * @since 5.2.0
- * @var string
- */
- private $site_path;
-
- /**
- * WP_Recovery_Mode_Cookie_Service constructor.
- *
- * @since 5.2.0
- *
- * @param array $opts {
- * Recovery mode cookie options.
- *
- * @type string $name Cookie name.
- * @type string $domain Cookie domain.
- * @type string $path Cookie path.
- * @type string $site_path Site cookie path.
- * }
- */
- public function __construct( array $opts = array() ) {
- $opts = wp_parse_args(
- $opts,
- array(
- 'name' => RECOVERY_MODE_COOKIE,
- 'domain' => COOKIE_DOMAIN,
- 'path' => COOKIEPATH,
- 'site_path' => SITECOOKIEPATH,
- )
- );
-
- $this->name = $opts['name'];
- $this->domain = $opts['domain'];
- $this->path = $opts['path'];
- $this->site_path = $opts['site_path'];
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Checks whether the recovery mode cookie is set.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the cookie is set, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_cookie_set() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ! empty( $_COOKIE[ $this->name ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ! empty( $_COOKIE[ RECOVERY_MODE_COOKIE ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,10 +35,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->generate_cookie();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setcookie( $this->name, $value, 0, $this->path, $this->domain, is_ssl(), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( RECOVERY_MODE_COOKIE, $value, 0, COOKIEPATH, COOKIE_DOMAIN, is_ssl(), true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->path !== $this->site_path ) {
- setcookie( $this->name, $value, 0, $this->site_path, $this->domain, is_ssl(), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( COOKIEPATH !== SITECOOKIEPATH ) {
+ setcookie( RECOVERY_MODE_COOKIE, $value, 0, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl(), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,8 +48,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function clear_cookie() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setcookie( $this->name, ' ', time() - YEAR_IN_SECONDS, $this->path, $this->domain );
- setcookie( $this->name, ' ', time() - YEAR_IN_SECONDS, $this->site_path, $this->domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( RECOVERY_MODE_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+ setcookie( RECOVERY_MODE_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,11 +64,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function validate_cookie( $cookie = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $cookie ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_COOKIE[ $this->name ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_COOKIE[ RECOVERY_MODE_COOKIE ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'no_cookie', __( 'No cookie present.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = $_COOKIE[ $this->name ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = $_COOKIE[ RECOVERY_MODE_COOKIE ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = $this->parse_cookie( $cookie );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,11 +119,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_session_id_from_cookie( $cookie = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $cookie ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_COOKIE[ $this->name ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_COOKIE[ RECOVERY_MODE_COOKIE ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'no_cookie', __( 'No cookie present.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cookie = $_COOKIE[ $this->name ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cookie = $_COOKIE[ RECOVERY_MODE_COOKIE ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = $this->parse_cookie( $cookie );
</span></span></pre>
</div>
</div>
</body>
</html>