<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12771] trunk: sync single and multisite cookie hash,
remove extraneous code, See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12771">12771</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-20 01:14:05 +0000 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>sync single and multisite cookie hash, remove extraneous code, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12770 => 12771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-01-19 20:12:04 UTC (rev 12770)
+++ trunk/wp-admin/includes/schema.php 2010-01-20 01:14:05 UTC (rev 12771)
</span><span class="lines">@@ -687,7 +687,8 @@
</span><span class="cx">
</span><span class="cx"> --The Team @ SITE_NAME')", $network_id ) );
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, %d, 'first_post', 'Welcome to <a href=\"SITE_URL\">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' )", $network_id ) );
</span><del>- $weblog_title = stripslashes( $_POST[ 'weblog_title' ] );
</del><ins>+ //@todo - network admins should have a method of editing the network siteurl (used for cookie hash)
+ $wpdb->query( $wpdb->prepare( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, %d, 'siteurl', %s)", $network_id, get_option( 'siteurl' ) ) );
</ins><span class="cx">
</span><span class="cx"> $current_site->domain = $domain;
</span><span class="cx"> $current_site->path = $base;
</span></span></pre></div>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (12770 => 12771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php 2010-01-19 20:12:04 UTC (rev 12770)
+++ trunk/wp-includes/default-constants.php 2010-01-20 01:14:05 UTC (rev 12771)
</span><span class="lines">@@ -134,8 +134,13 @@
</span><span class="cx"> * Used to guarantee unique hash cookies
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><del>- if( !defined('COOKIEHASH') )
- define('COOKIEHASH', md5(get_option('siteurl')));
</del><ins>+ if ( !defined( 'COOKIEHASH' ) ) {
+ $siteurl = get_site_option( 'siteurl' );
+ if ( $siteurl )
+ define( 'COOKIEHASH', md5( $siteurl ) );
+ else
+ define( 'COOKIEHASH', '' );
+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
</span><span class="lines">@@ -276,4 +281,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (12770 => 12771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-01-19 20:12:04 UTC (rev 12770)
+++ trunk/wp-includes/ms-load.php 2010-01-20 01:14:05 UTC (rev 12771)
</span><span class="lines">@@ -48,18 +48,6 @@
</span><span class="cx"> if( $current_site->site_name == false )
</span><span class="cx"> $current_site->site_name = ucfirst( $current_site->domain );
</span><span class="cx">
</span><del>- if ( ! defined('WP_INSTALLING') ) {
- if ( !isset($cookiehash) )
- $cookiehash = '';
-
- /**
- * Used to guarantee unique hash cookies
- * @since 1.5
- */
- if ( !defined('COOKIEHASH') )
- define( 'COOKIEHASH', $cookiehash );
- }
-
</del><span class="cx"> $wpdb->hide_errors();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>