<!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>[34810] trunk/tests/phpunit: Tests: Permalink Structures Phase II: DRY up logic for setting permalink structures in test methods.</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/34810">34810</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/34810","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>DrewAPicture</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-03 20:54:11 +0000 (Sat, 03 Oct 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'>Tests: Permalink Structures Phase II: DRY up logic for setting permalink structures in test methods.
Renames `reset_permalinks()` to `set_permalink_structure()` (mimicking `$wp_rewrite->set_permalink_structure()`) and allows it to accept an optional permalink structure. In this way, we can double dip using it to both set and reset the permalink structure from anywhere.
Removes alot of duplicated code from tests.
See <a href="https://core.trac.wordpress.org/ticket/33968">#33968</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPostCommentsFeedLinkphp">trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php</a></li>
<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>
<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.php</a></li>
<li><a href="#trunktestsphpunittestsqueryisTermphp">trunk/tests/phpunit/tests/query/isTerm.php</a></li>
<li><a href="#trunktestsphpunittestsqueryverboseRewriteRulesphp">trunk/tests/phpunit/tests/query/verboseRewriteRules.php</a></li>
<li><a href="#trunktestsphpunittestsqueryphp">trunk/tests/phpunit/tests/query.php</a></li>
<li><a href="#trunktestsphpunittestsrewritenumericSlugsphp">trunk/tests/phpunit/tests/rewrite/numericSlugs.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldSlugRedirectphp">trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php</a></li>
<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermLinkphp">trunk/tests/phpunit/tests/term/getTermLink.php</a></li>
<li><a href="#trunktestsphpunittestsuserauthorphp">trunk/tests/phpunit/tests/user/author.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/includes/testcase.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->reset_post_types();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->reset_taxonomies();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->reset_post_statuses();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_permalinks();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure();
</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"> $this->start_transaction();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,12 +653,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Rewrite $wp_rewrite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $structure Optional. Permalink structure to set. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function reset_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_permalink_structure( $structure = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->init();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->set_permalink_structure( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_rewrite->set_permalink_structure( $structure );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->flush_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,11 +251,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30910
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_return_pretty_permalink_for_posts_with_post_status_future() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = '%postname%';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
- flush_rewrite_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( "/$permalink_structure/" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $future_date = date( 'Y-m-d H:i:s', time() + 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,10 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18306
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_post_link_when_pretty_permalinks_are_enabled() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $permalink_structure = '%postname%';
- $wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
- flush_rewrite_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,10 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18306
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_link_when_changing_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $permalink_structure = '%postname%';
- $wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
- flush_rewrite_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,10 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_year_archives() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '2015',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,10 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_allow_yearlike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '2015',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,10 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_month_archives() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '11',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,10 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_ignore_potential_month_conflicts_for_invalid_monthnum() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '13',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,10 +393,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_day_archives() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,10 +407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_iterate_slug_suffix_when_a_date_conflict_is_found() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30-2',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,10 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_ignore_potential_day_conflicts_for_invalid_day() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '32',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,10 +439,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sample_permalink_should_allow_daylike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => '30',
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPostCommentsFeedLinkphp"></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/link/getPostCommentsFeedLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/link/getPostCommentsFeedLink.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,10 +17,7 @@
</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"> public function test_post_pretty_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,10 +44,7 @@
</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"> public function test_attachment_pretty_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,10 +64,7 @@
</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"> public function test_attachment_no_name_pretty_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,10 +94,7 @@
</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"> public function test_unattached_pretty_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span></span></pre></div>
<a id="trunktestsphpunittestslinkphp"></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/link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/link.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,9 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_pagenum_link_case_insensitivity() {
</span><span class="cx" style="display: block; padding: 0 10px"> $old_req_uri = $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'home_url', array( $this, '_get_pagenum_link_cb' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = '/woohoo';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +33,6 @@
</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"> function test_wp_get_shortlink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id2 = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,8 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', wp_get_shortlink( 0 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', wp_get_shortlink() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // With a permalink structure set, get_permalink() will no longer match.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( get_permalink( $post_id ), wp_get_shortlink( $post_id, 'post' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,9 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't test against get_permalink() since it uses ?page_id= for pages.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( home_url( '?p=' . $post_id ), wp_get_shortlink( $post_id, 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( home_url( '?p=' . $post_id ), wp_get_shortlink( $post_id, 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,10 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( home_url( '/' ), wp_get_shortlink( $post_id, 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->permalink_structure = '';
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( home_url( '/' ), wp_get_shortlink( $post_id, 'post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,9 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 1914
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unattached_attachment_has_a_pretty_permalink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => 'image/jpeg',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,12 +404,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 1914
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_attachment_attached_to_non_existent_post_type_has_a_pretty_permalink() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite, $wp_post_types;
- $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_post_types;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'not_a_post_type', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ flush_rewrite_rules();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create( array( 'post_type' => 'not_a_post_type' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpUniquePostSlugphp"></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/post/wpUniquePostSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,10 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_be_suffixed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,10 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_not_be_suffixed_for_already_published_posts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,10 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_yearlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_year_archives() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,10 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_month_archives_should_be_suffixed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,10 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_monthlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_month_archives() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/foo/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/foo/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,10 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_monthlike_slugs_should_not_be_suffixed_for_invalid_month_numbers() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,10 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_slugs_resulting_in_permalinks_that_resemble_day_archives_should_be_suffixed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,10 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_daylike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_day_archives() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,10 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_daylike_slugs_should_not_be_suffixed_for_invalid_day_numbers() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/post.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,10 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5305
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_insert_post_should_not_allow_a_bare_numeric_slug_that_might_conflict_with_a_date_archive_when_generating_from_an_empty_post_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $p = wp_insert_post( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $p );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_permalinks();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( "$p-2", $post->post_name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,10 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // bug: permalink doesn't work if post title is empty
</span><span class="cx" style="display: block; padding: 0 10px"> // might only fail if the post ID is greater than four characters
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></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/query/conditionals.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/conditionals.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,14 +22,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comments_per_page', 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'posts_per_page', 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
-
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</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"> function tearDown() {
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryisTermphp"></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/query/isTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/isTerm.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/query/isTerm.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $tax;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
</del><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,13 +30,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_the_query'] = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'testtax', 'post', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ flush_rewrite_rules();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->tag_id = $this->factory->tag->create( array( 'slug' => 'tag-slug' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cat_id = $this->factory->category->create( array( 'slug' => 'cat-slug' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryverboseRewriteRulesphp"></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/query/verboseRewriteRules.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/verboseRewriteRules.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/query/verboseRewriteRules.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,15 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query_VerbosePageRules extends Tests_Query_Conditionals {
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
-
</del><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%category%/%year%/%postname%/' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%category%/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/query.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,15 +3,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Query extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
</del><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</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></pre></div>
<a id="trunktestsphpunittestsrewritenumericSlugsphp"></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/rewrite/numericSlugs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/numericSlugs.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/rewrite/numericSlugs.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,10 +20,8 @@
</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"> public function test_go_to_year_segment_collision_without_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite, $wpdb;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +48,8 @@
</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"> public function test_url_to_postid_year_segment_collision_without_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite, $wpdb;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,10 +74,7 @@
</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"> public function test_go_to_year_segment_collision_with_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,10 +90,7 @@
</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"> public function test_url_to_postid_year_segment_collision_with_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,10 +104,7 @@
</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"> public function test_go_to_month_segment_collision_without_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,10 +121,7 @@
</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"> public function test_url_to_postid_month_segment_collision_without_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,10 +136,7 @@
</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"> public function test_go_to_month_segment_collision_without_title_no_leading_zero() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,10 +153,7 @@
</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"> public function test_url_to_postid_month_segment_collision_without_title_no_leading_zero() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,10 +168,7 @@
</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"> public function test_go_to_month_segment_collision_with_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,10 +184,7 @@
</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"> public function test_url_to_postid_month_segment_collision_with_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,10 +198,7 @@
</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"> public function test_go_to_month_segment_collision_with_title_no_leading_zero() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,10 +214,7 @@
</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"> public function test_url_to_postid_month_segment_collision_with_title_no_leading_zero() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,10 +228,7 @@
</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"> public function test_go_to_day_segment_collision_without_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,10 +245,7 @@
</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"> public function test_url_to_postid_day_segment_collision_without_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,10 +260,7 @@
</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"> public function test_go_to_day_segment_collision_with_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,10 +276,7 @@
</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"> public function test_url_to_postid_day_segment_collision_with_title() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,10 +290,7 @@
</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"> public function test_numeric_slug_permalink_conflicts_should_only_be_resolved_for_the_main_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,10 +311,7 @@
</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"> public function test_month_slug_collision_should_resolve_to_date_archive_when_year_does_not_match_post_year() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure a post is published in 2013/02, to avoid 404s.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->post->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,10 +339,7 @@
</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"> public function test_day_slug_collision_should_resolve_to_date_archive_when_monthnum_does_not_match_post_month() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure a post is published on 2015/01/01, to avoid 404s.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->post->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,10 +367,7 @@
</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"> public function test_date_slug_collision_should_distinguish_valid_pagination_from_date() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,10 +383,7 @@
</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"> public function test_date_slug_collision_should_distinguish_too_high_pagination_from_date() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,10 +399,7 @@
</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"> public function test_date_slug_collision_should_not_require_pagination_query_var() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,10 +416,7 @@
</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"> public function test_date_slug_collision_should_be_ignored_when_pagination_var_is_present_but_post_does_not_have_multiple_pages() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldSlugRedirectphp"></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/rewrite/oldSlugRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,13 +19,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'old_slug_redirect_url', array( $this, 'filter_old_slug_redirect_url' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
</del><span class="cx" style="display: block; padding: 0 10px"> add_rewrite_endpoint( 'custom-endpoint', EP_PERMALINK );
</span><span class="cx" style="display: block; padding: 0 10px"> add_rewrite_endpoint( 'second-endpoint', EP_PERMALINK, 'custom' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ flush_rewrite_rules();
</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"> public function tearDown() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></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/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/rewrite.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,16 +9,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private $home_url;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
</del><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Need rewrite rules in place to use url_to_postid
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> create_initial_taxonomies();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->home_url = get_option( 'home' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermLinkphp"></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/term/getTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermLink.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/term/getTermLink.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,10 +85,7 @@
</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"> public function test_taxonomy_permastruct_with_hierarchical_rewrite_should_put_term_ancestors_in_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,6 +95,8 @@
</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">+ flush_rewrite_rules();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $t1 = $this->factory->term->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'term1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,10 +114,7 @@
</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"> public function test_taxonomy_permastruct_with_nonhierarchical_rewrite_should_not_put_term_ancestors_in_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $permalink_structure = get_option( 'permalink_structure' );
- $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax2', 'post', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,6 +124,8 @@
</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">+ flush_rewrite_rules();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $t1 = $this->factory->term->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'wptests_tax2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'term1',
</span></span></pre></div>
<a id="trunktestsphpunittestsuserauthorphp"></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/user/author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/author.php 2015-10-03 20:24:09 UTC (rev 34809)
+++ trunk/tests/phpunit/tests/user/author.php 2015-10-03 20:54:11 UTC (rev 34810)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,10 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30355
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_the_author_posts_link_with_permalinks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_rewrite;
- $wp_rewrite->init();
- $wp_rewrite->set_permalink_structure( '/%postname%/' );
- $wp_rewrite->flush_rules();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_permalink_structure( '/%postname%/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = $this->factory->user->create_and_get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'Foo',
</span></span></pre>
</div>
</div>
</body>
</html>