<!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>[31155] trunk: Enforce leading and trailing slashes on paths updated with `update_blog_details()`</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 { 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/31155">31155</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/31155","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-12 01:42:46 +0000 (Mon, 12 Jan 2015)</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'>Enforce leading and trailing slashes on paths updated with `update_blog_details()`
In multisite, core expects the stored value for a site's path to have leading and trailing slashes. When these slashes are missing, it becomes impossible to visit the site.
This enforces proper `/path/` creation in `update_blog_details()`, most likely used when updating an existing site through `site-info.php`.
Props earnjam, simonwheatley.
Fixes <a href="https://core.trac.wordpress.org/ticket/18117">#18117</a>. Fixes <a href="https://core.trac.wordpress.org/ticket/23865">#23865</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsblogsphp"></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/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2015-01-12 00:22:12 UTC (rev 31154)
+++ trunk/src/wp-includes/ms-blogs.php 2015-01-12 01:42:46 UTC (rev 31155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,9 +296,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_details = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
- $update_details[$field] = $details[$field];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
+ if ( 'path' === $field ) {
+ $details[ $field ] = array_filter( explode( '/', $details[ $field ] ) );
+ $details[ $field ] = trailingslashit( '/' . implode( '/', $details[ $field ] ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_details[ $field ] = $details[ $field ];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $result )
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2015-01-12 00:22:12 UTC (rev 31154)
+++ trunk/tests/phpunit/tests/multisite/site.php 2015-01-12 01:42:46 UTC (rev 31155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'example.com', $blog->domain );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'my_path/', $blog->path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '/my_path/', $blog->path );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '0', $blog->spam );
</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">@@ -543,6 +543,79 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When the path for a site is updated with update_blog_details(), the final
+ * path should have a leading and trailing slash. When multiple directories
+ * are part of the path, only one slash should separate each directory.
+ *
+ * @ticket 18117
+ */
+ function test_update_blog_details_single_path_no_slashes() {
+ update_blog_details( 1, array( 'path' => 'my_path' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/my_path/', $blog->path );
+ }
+
+ function test_update_blog_details_single_path_double_trailing_slashes() {
+ update_blog_details( 1, array( 'path' => 'my_path//' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/my_path/', $blog->path );
+ }
+
+ function test_update_blog_details_single_path_double_leading_slashes() {
+ update_blog_details( 1, array( 'path' => '//my_path' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/my_path/', $blog->path );
+ }
+
+ function test_update_blog_details_single_path_single_trailing_slash() {
+ update_blog_details( 1, array( 'path' => 'my_path/' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/my_path/', $blog->path );
+ }
+
+ function test_update_blog_details_single_path_single_leading_slashes() {
+ update_blog_details( 1, array( 'path' => '/my_path' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/my_path/', $blog->path );
+ }
+
+ function test_update_blog_details_single_path_both_slashes() {
+ update_blog_details( 1, array( 'path' => '/my_path/' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/my_path/', $blog->path );
+ }
+
+ function test_update_blog_details_multiple_paths_no_slashes() {
+ update_blog_details( 1, array( 'path' => 'multiple/dirs' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/multiple/dirs/', $blog->path );
+ }
+
+ function test_update_blog_details_multiple_paths_middle_slashes() {
+ update_blog_details( 1, array( 'path' => 'multiple///dirs' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/multiple/dirs/', $blog->path );
+ }
+
+ function test_update_blog_details_multiple_paths_leading_slash() {
+ update_blog_details( 1, array( 'path' => '/multiple/dirs' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/multiple/dirs/', $blog->path );
+ }
+
+ function test_update_blog_details_multiple_paths_trailing_slash() {
+ update_blog_details( 1, array( 'path' => 'multiple/dirs/' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/multiple/dirs/', $blog->path );
+ }
+
+ function test_update_blog_details_multiple_paths_both_slashes() {
+ update_blog_details( 1, array( 'path' => '/multiple/dirs/' ) );
+ $blog = get_blog_details( 1 );
+ $this->assertEquals( '/multiple/dirs/', $blog->path );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test cached data for a site that does not exist and then again after it exists.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23405
</span></span></pre>
</div>
</div>
</body>
</html>