<!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>[25258] trunk: Avoids incorrect results when `url_to_postid()` checking is not strict enough.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25258">25258</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-05 17:28:52 +0000 (Thu, 05 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoids incorrect results when `url_to_postid()` checking is not strict enough. Adds a bunch of Unit Tests for `url_to_postid()', which is currently only tested lightly in some XML-RPC tests.
Props gcorne, gradyetc.
Fixes <a href="http://core.trac.wordpress.org/ticket/20560">#20560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/rewrite.php (25257 => 25258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/rewrite.php 2013-09-05 17:14:54 UTC (rev 25257)
+++ trunk/src/wp-includes/rewrite.php 2013-09-05 17:28:52 UTC (rev 25258)
</span><span class="lines">@@ -324,14 +324,14 @@
</span><span class="cx"> if ( !$wp_rewrite->using_index_permalinks() )
</span><span class="cx"> $url = str_replace( $wp_rewrite->index . '/', '', $url );
</span><span class="cx">
</span><del>- if ( false !== strpos($url, home_url()) ) {
- // Chop off http://domain.com
</del><ins>+ if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
+ // Chop off http://domain.com/[path]
</ins><span class="cx"> $url = str_replace(home_url(), '', $url);
</span><span class="cx"> } else {
</span><span class="cx"> // Chop off /path/to/blog
</span><del>- $home_path = parse_url(home_url());
</del><ins>+ $home_path = parse_url( home_url( '/' ) );
</ins><span class="cx"> $home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
</span><del>- $url = str_replace($home_path, '', $url);
</del><ins>+ $url = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Trim leading and lagging slashes
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></a>
<div class="addfile"><h4>Added: trunk/tests/phpunit/tests/rewrite.php (0 => 25258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/rewrite.php (rev 0)
+++ trunk/tests/phpunit/tests/rewrite.php 2013-09-05 17:28:52 UTC (rev 25258)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+<?php
+
+/**
+ * A set of unit tests for functions in wp-includes/rewrite.php
+ *
+ * @group rewrite
+ */
+class Tests_Rewrite extends WP_UnitTestCase {
+
+ function setUp() {
+ parent::setUp();
+
+ // Need rewrite rules in place to use url_to_postid
+ global $wp_rewrite;
+ update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+ create_initial_taxonomies();
+ $GLOBALS['wp_rewrite']->init();
+ flush_rewrite_rules();
+ }
+
+ function tearDown() {
+ parent::tearDown();
+ $GLOBALS['wp_rewrite']->init();
+ }
+
+ function test_url_to_postid() {
+
+ $id = $this->factory->post->create();
+ $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
+
+ $id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+ $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
+ }
+
+ function test_url_to_postid_hierarchical() {
+
+ $parent_id = $this->factory->post->create( array( 'post_title' => 'Parent', 'post_type' => 'page' ) );
+ $child_id = $this->factory->post->create( array( 'post_title' => 'Child', 'post_type' => 'page', 'post_parent' => $parent_id ) );
+
+ $this->assertEquals( $parent_id, url_to_postid( get_permalink( $parent_id ) ) );
+ $this->assertEquals( $child_id, url_to_postid( get_permalink( $child_id ) ) );
+ }
+
+ function test_url_to_postid_home_has_path() {
+
+ update_option( 'home', home_url( '/example/' ) );
+
+ $id = $this->factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'examp' ) );
+ $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
+ $this->assertEquals( $id, url_to_postid( site_url('/example/examp' ) ) );
+ $this->assertEquals( $id, url_to_postid( '/example/examp/' ) );
+ $this->assertEquals( $id, url_to_postid( '/example/examp' ) );
+
+ $this->assertEquals( 0, url_to_postid( site_url( '/example/ex' ) ) );
+ $this->assertEquals( 0, url_to_postid( '/example/ex' ) );
+ $this->assertEquals( 0, url_to_postid( '/example/ex/' ) );
+ $this->assertEquals( 0, url_to_postid( '/example-page/example/' ) );
+ $this->assertEquals( 0, url_to_postid( '/example-page/ex/' ) );
+ }
+
+ function test_url_to_postid_dupe_path() {
+ update_option( 'home', home_url('/example/') );
+
+ $id = $this->factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'example' ) );
+
+ $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
+ $this->assertEquals( $id, url_to_postid( site_url( '/example/example/' ) ) );
+ $this->assertEquals( $id, url_to_postid( '/example/example/' ) );
+ $this->assertEquals( $id, url_to_postid( '/example/example' ) );
+ }
+
+ /**
+ * Reveals bug introduced in WP 3.0
+ */
+ function test_url_to_postid_home_url_collision() {
+ update_option( 'home', home_url( '/example' ) );
+
+ $this->factory->post->create( array( 'post_title' => 'Collision', 'post_type' => 'page', 'post_name' => 'collision' ) );
+
+ // This url should NOT return a post ID
+ $badurl = site_url( '/example-collision' );
+ $this->assertEquals( 0, url_to_postid( $badurl ) );
+ }
+
+ /**
+ * Reveals bug introduced in WP 3.0
+ *
+ * Run tests using multisite `phpunit -c multisite`
+ */
+ function test_url_to_postid_ms_home_url_collision() {
+
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'test_url_to_postid_ms_home_url_collision requires multisite' );
+ return false;
+ }
+
+ $blog_id = $this->factory->blog->create( array( 'path' => '/example' ) );
+ switch_to_blog( $blog_id );
+
+ $this->factory->post->create( array( 'post_title' => 'Collision ', 'post_type' => 'page' ) );
+
+ // This url should NOT return a post ID
+ $badurl = network_home_url( '/example-collision' );
+ $this->assertEquals( 0, url_to_postid( $badurl ) );
+
+ restore_current_blog();
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>