<!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>[443] wp-testcase/test_includes_canonical.php: Fix whitespace/indentation in canonical tests.</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, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>443</dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2011-09-21 19:58:55 +0000 (Wed, 21 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix whitespace/indentation in canonical tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_includes_canonicalphp">wp-testcase/test_includes_canonical.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_includes_canonicalphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_canonical.php (442 => 443)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_canonical.php 2011-09-21 08:49:46 UTC (rev 442)
+++ wp-testcase/test_includes_canonical.php 2011-09-21 19:58:55 UTC (rev 443)
</span><span class="lines">@@ -98,115 +98,113 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function data() {
</span><del>- return array( /*
- Format: [0]: $test_url,
- [1]: expected results: Any of the following can be used
- array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
- array( expected query vars to be set, same as 'qv' above )
- (string) expected redirect location
- [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
- */
</del><ins>+ /* Data format:
+ * [0]: $test_url,
+ * [1]: expected results: Any of the following can be used
+ * array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
+ * array( expected query vars to be set, same as 'qv' above )
+ * (string) expected redirect location
+ * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
+ */
</ins><span class="cx">
</span><del>- // Please Note: A few test cases are commented out below, Look at the test case following it, in most cases it's simple showing 2 options for the "proper" redirect.
</del><ins>+ // Please Note: A few test cases are commented out below, Look at the test case following it, in most cases it's simple showing 2 options for the "proper" redirect.
+ return array(
+ // Categories
+ array( '?cat=32', '/category/parent/', 15256 ),
+ array( '?cat=50', '/category/parent/child-1/', 15256 ),
+ array( '?cat=51', '/category/parent/child-1/child-2/' ), // no children
+ array( '/category/uncategorized/', array( 'url' => '/category/uncategorized/', 'qv' => array( 'category_name' => 'uncategorized' ) ) ),
+ array( '/category/uncategorized/page/2/', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
+ array( '/category/uncategorized/?paged=2', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
+ array( '/category/uncategorized/?paged=2&category_name=uncategorized', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ), 17174 ),
</ins><span class="cx">
</span><del>- // Categories
- array( '?cat=32', '/category/parent/', 15256 ),
- array( '?cat=50', '/category/parent/child-1/', 15256 ),
- array( '?cat=51', '/category/parent/child-1/child-2/' ), // no children
- array( '/category/uncategorized/', array( 'url' => '/category/uncategorized/', 'qv' => array( 'category_name' => 'uncategorized' ) ) ),
- array( '/category/uncategorized/page/2/', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
- array( '/category/uncategorized/?paged=2', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ) ),
- array( '/category/uncategorized/?paged=2&category_name=uncategorized', array( 'url' => '/category/uncategorized/page/2/', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2) ), 17174 ),
</del><ins>+ // Categories & Intersections with other vars
+ array( '/category/uncategorized/?tag=post-formats', array( 'url' => '/category/uncategorized/?tag=post-formats', 'qv' => array('category_name' => 'uncategorized', 'tag' => 'post-formats') ) ),
+ array( '/?category_name=cat-a,cat-b', array( 'url' => '/?category_name=cat-a,cat-b', 'qv' => array('category_name' => 'cat-a,cat-b' ) ) ),
</ins><span class="cx">
</span><del>- // Categories & Intersections with other vars
- array( '/category/uncategorized/?tag=post-formats', array( 'url' => '/category/uncategorized/?tag=post-formats', 'qv' => array('category_name' => 'uncategorized', 'tag' => 'post-formats') ) ),
- array( '/?category_name=cat-a,cat-b', array( 'url' => '/?category_name=cat-a,cat-b', 'qv' => array('category_name' => 'cat-a,cat-b' ) ) ),
</del><ins>+ // Categories with Dates
+ array( '/category/uncategorized/?paged=2&year=2008', array( 'url' => '/category/uncategorized/page/2/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2, 'year' => 2008) ), 17661 ),
+// array( '/2008/04/?cat=1', array( 'url' => '/2008/04/?cat=1', 'qv' => array('cat' => '1', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
+ array( '/2008/04/?cat=1', array( 'url' => '/category/uncategorized/?year=2008&monthnum=04', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
+// array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
+ array( '/2008/?category_name=cat-a', array( 'url' => '/category/cat-a/?year=2008', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
+// array( '/category/uncategorized/?year=2008', array( 'url' => '/2008/?category_name=uncategorized', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
+ array( '/category/uncategorized/?year=2008', array( 'url' => '/category/uncategorized/?year=2008', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
</ins><span class="cx">
</span><del>- // Categories with Dates
- array( '/category/uncategorized/?paged=2&year=2008', array( 'url' => '/category/uncategorized/page/2/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'paged' => 2, 'year' => 2008) ), 17661 ),
-// array( '/2008/04/?cat=1', array( 'url' => '/2008/04/?cat=1', 'qv' => array('cat' => '1', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
- array( '/2008/04/?cat=1', array( 'url' => '/category/uncategorized/?year=2008&monthnum=04', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008', 'monthnum' => '04' ) ), 17661 ),
-// array( '/2008/?category_name=cat-a', array( 'url' => '/2008/?category_name=cat-a', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
- array( '/2008/?category_name=cat-a', array( 'url' => '/category/cat-a/?year=2008', 'qv' => array('category_name' => 'cat-a', 'year' => '2008' ) ) ),
-// array( '/category/uncategorized/?year=2008', array( 'url' => '/2008/?category_name=uncategorized', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
- array( '/category/uncategorized/?year=2008', array( 'url' => '/category/uncategorized/?year=2008', 'qv' => array('category_name' => 'uncategorized', 'year' => '2008' ) ), 17661 ),
</del><ins>+ // Tags
+ array( '?tag_ID=56', '/tag/crushing/'),
</ins><span class="cx">
</span><del>- // Tags
- array( '?tag_ID=56', '/tag/crushing/'),
</del><ins>+ // Pages
+ array( '/sample%20page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 17653 ), // Page rules always set 'page'
+ array( '/sample------page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
+ array( '/child-page-1/', '/parent-page/child-page-1/'),
+ array( '/?page_id=144', '/parent-page/child-page-1/'),
+ array( '/abo', '/about/' ),
</ins><span class="cx">
</span><del>- // Pages
- array( '/sample%20page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 17653 ), // Page rules always set 'page'
- array( '/sample------page/', array( 'url' => '/sample-page/', 'qv' => array('pagename' => 'sample-page', 'page' => '' ) ), 14773 ),
- array( '/child-page-1/', '/parent-page/child-page-1/'),
- array( '/?page_id=144', '/parent-page/child-page-1/'),
- array( '/abo', '/about/' ),
</del><ins>+ // Posts
+ array( '?p=587', '/2008/06/02/post-format-test-audio/'),
+ array( '/?name=images-test', '/2008/09/03/images-test/'),
+ array( '/?pagename=images-test', '/2008/09/03/images-test/'),
</ins><span class="cx">
</span><ins>+ array( '/2008/06/02/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+ array( '/2008/06/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+ array( '/2008/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
+ array( '/2010/post-format-test-au/', '/2008/06/02/post-format-test-audio/'), // A Year the post is not in
+ array( '/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
</ins><span class="cx">
</span><del>- // Posts
- array( '?p=587', '/2008/06/02/post-format-test-audio/'),
- array( '/?name=images-test', '/2008/09/03/images-test/'),
- array( '/?pagename=images-test', '/2008/09/03/images-test/'),
</del><ins>+ array( '/2008/09/03/images-test/3/', array( 'url' => '/2008/09/03/images-test/3/', 'qv' => array( 'name' => 'images-test', 'year' => '2008', 'monthnum' => '09', 'day' => '03', 'page' => '/3' ) ) ), // page = /3 ?!
+ array( '/2008/09/03/images-test/8/', '/2008/09/03/images-test/4/' ), // post with 4 pages
+ array( '/2008/09/03/images-test/?page=3', '/2008/09/03/images-test/3/' ),
+ array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),
</ins><span class="cx">
</span><del>- array( '/2008/06/02/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
- array( '/2008/06/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
- array( '/2008/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
- array( '/2010/post-format-test-au/', '/2008/06/02/post-format-test-audio/'), // A Year the post is not in
- array( '/post-format-test-au/', '/2008/06/02/post-format-test-audio/'),
</del><ins>+ // Comments
+ array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/'),
+ array( '/2008/03/03/comment-test/comment-page-20/', '/2008/03/03/comment-test/comment-page-3/'), // there's only 3 pages
+ array( '/2008/03/03/comment-test/?cpage=30', '/2008/03/03/comment-test/comment-page-3/'), // there's only 3 pages
</ins><span class="cx">
</span><del>- array( '/2008/09/03/images-test/3/', array( 'url' => '/2008/09/03/images-test/3/', 'qv' => array( 'name' => 'images-test', 'year' => '2008', 'monthnum' => '09', 'day' => '03', 'page' => '/3' ) ) ), // page = /3 ?!
- array( '/2008/09/03/images-test/8/', '/2008/09/03/images-test/4/' ), // post with 4 pages
- array( '/2008/09/03/images-test/?page=3', '/2008/09/03/images-test/3/' ),
- array( '/2008/09/03/images-te?page=3', '/2008/09/03/images-test/3/' ),
</del><ins>+ // Attachments
+ array( '/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
+ array( '/2008/09/03/images-test/canola2/', '/2008/06/10/post-format-test-gallery/canola2/' ), // Image accessed via incorrect parent
+ array( '/2008/06/10/post-format-test-gallery/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
</ins><span class="cx">
</span><del>- // Comments
- array( '/2008/03/03/comment-test/?cpage=2', '/2008/03/03/comment-test/comment-page-2/'),
- array( '/2008/03/03/comment-test/comment-page-20/', '/2008/03/03/comment-test/comment-page-3/'), // there's only 3 pages
- array( '/2008/03/03/comment-test/?cpage=30', '/2008/03/03/comment-test/comment-page-3/'), // there's only 3 pages
</del><ins>+ // Dates
+ array( '/?m=2008', '/2008/' ),
+ array( '/?m=200809', '/2008/09/'),
+ array( '/?m=20080905', '/2008/09/05/'),
+ array( '/?m=2008095', '/2008/09/05/'), // Invalid date, /09/ or /09/05/ perhaps?
</ins><span class="cx">
</span><del>- // Attachments
- array( '/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
- array( '/2008/09/03/images-test/canola2/', '/2008/06/10/post-format-test-gallery/canola2/' ), // Image accessed via incorrect parent
- array( '/2008/06/10/post-format-test-gallery/?attachment_id=611', '/2008/06/10/post-format-test-gallery/canola2/' ),
</del><ins>+ array( '/2008/?day=05', '/2008/?day=05'), // no redirect
+ array( '/2008/09/?day=05', '/2008/09/05/'),
+ array( '/2008/?monthnum=9', '/2008/09/'),
</ins><span class="cx">
</span><del>- // Dates
- array( '/?m=2008', '/2008/' ),
- array( '/?m=200809', '/2008/09/'),
- array( '/?m=20080905', '/2008/09/05/'),
- array( '/?m=2008095', '/2008/09/05/'), // Invalid date, /09/ or /09/05/ perhaps?
</del><ins>+ array( '/?year=2008', '/2008/'),
</ins><span class="cx">
</span><del>- array( '/2008/?day=05', '/2008/?day=05'), // no redirect
- array( '/2008/09/?day=05', '/2008/09/05/'),
- array( '/2008/?monthnum=9', '/2008/09/'),
</del><ins>+ // Authors
+ array( '/?author=3', '/author/chip-bennett/' ),
+// array( '/?author=3&year=2008', '/2008/?author=3'),
+ array( '/?author=3&year=2008', '/author/chip-bennett/?year=2008'),
+// array( '/author/chip-bennett/?year=2008', '/2008/?author=3'), //Either or, see previous testcase.
+ array( '/author/chip-bennett/?year=2008', '/author/chip-bennett/?year=2008'),
</ins><span class="cx">
</span><del>- array( '/?year=2008', '/2008/'),
</del><ins>+ // Feeds
+ array( '/?feed=atom', '/feed/atom/' ),
+ array( '/?feed=rss2', '/feed/' ),
+ array( '/?feed=comments-rss2', '/comments/feed/'),
+ array( '/?feed=comments-atom', '/comments/feed/atom/'),
</ins><span class="cx">
</span><del>- // Authors
- array( '/?author=3', '/author/chip-bennett/' ),
-// array( '/?author=3&year=2008', '/2008/?author=3'),
- array( '/?author=3&year=2008', '/author/chip-bennett/?year=2008'),
-// array( '/author/chip-bennett/?year=2008', '/2008/?author=3'), //Either or, see previous testcase.
- array( '/author/chip-bennett/?year=2008', '/author/chip-bennett/?year=2008'),
</del><ins>+ // Feeds (per-post)
+ array( '/2008/03/03/comment-test/?feed=comments-atom', '/2008/03/03/comment-test/feed/atom/'),
+ array( '/?p=149&feed=comments-atom', '/2008/03/03/comment-test/comments/feed/atom/'),
+ array( '/2008/03/03/comment-test/?feed=comments-atom', '/2008/03/03/comment-test/comments/feed/atom/' ), // Incorrect URL to an invalid URL?
</ins><span class="cx">
</span><del>- // Feeds
- array( '/?feed=atom', '/feed/atom/' ),
- array( '/?feed=rss2', '/feed/' ),
- array( '/?feed=comments-rss2', '/comments/feed/'),
- array( '/?feed=comments-atom', '/comments/feed/atom/'),
</del><ins>+ // Misc
+ array( '/2008%20', '/2008/' ),
+ array( '//2008////', '/2008/' ),
</ins><span class="cx">
</span><del>- // Feeds (per-post)
- array( '/2008/03/03/comment-test/?feed=comments-atom', '/2008/03/03/comment-test/feed/atom/'),
- array( '/?p=149&feed=comments-atom', '/2008/03/03/comment-test/comments/feed/atom/'),
- array( '/2008/03/03/comment-test/?feed=comments-atom', '/2008/03/03/comment-test/comments/feed/atom/' ), // Incorrect URL to an invalid URL?
</del><ins>+ // Todo: Endpoints (feeds, trackbacks, etc), More fuzzed mixed query variables, comment paging, Home page (Static)
</ins><span class="cx">
</span><del>- // Misc
- array( '/2008%20', '/2008/' ),
- array( '//2008////', '/2008/' ),
-
- // Todo: Endpoints (feeds, trackbacks, etc), More fuzzed mixed query variables, comment paging, Home page (Static)
-
- );
</del><ins>+ );
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class WP_Canonical_CustomRules extends WP_Canonical {
</span><span class="lines">@@ -219,19 +217,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function data() {
</span><del>- return array( /*
- Format: [0]: $test_url,
- [1]: expected results: Any of the following can be used
- array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
- array( expected query vars to be set, same as 'qv' above )
- (string) expected redirect location
- [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
- */
- // Custom Rewrite rules leading to Categories
- array( '/ccr/uncategorized/sort/asc/', array( 'url' => '/ccr/uncategorized/sort/asc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'asc' ) ) ),
- array( '/ccr/uncategorized/sort/desc/', array( 'url' => '/ccr/uncategorized/sort/desc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc' ) ) ),
- array( '/ccr/uncategorized/sort/desc/?year=2008', array( 'url' => '/ccr/uncategorized/sort/desc/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc', 'year' => '2008' ) ), 17661 ),
- );
</del><ins>+ /* Format:
+ * [0]: $test_url,
+ * [1]: expected results: Any of the following can be used
+ * array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
+ * array( expected query vars to be set, same as 'qv' above )
+ * (string) expected redirect location
+ * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
+ */
+ return array(
+ // Custom Rewrite rules leading to Categories
+ array( '/ccr/uncategorized/sort/asc/', array( 'url' => '/ccr/uncategorized/sort/asc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'asc' ) ) ),
+ array( '/ccr/uncategorized/sort/desc/', array( 'url' => '/ccr/uncategorized/sort/desc/', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc' ) ) ),
+ array( '/ccr/uncategorized/sort/desc/?year=2008', array( 'url' => '/ccr/uncategorized/sort/desc/?year=2008', 'qv' => array( 'category_name' => 'uncategorized', 'order' => 'desc', 'year' => '2008' ) ), 17661 ),
+ );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,29 +241,29 @@
</span><span class="cx"> // These test cases are run against the test handler in WP_Canonical
</span><span class="cx">
</span><span class="cx"> function data() {
</span><del>- return array( /*
- Format: [0]: $test_url,
- [1]: expected results: Any of the following can be used
- array( 'url': expected redirection location, 'qv': expected query vars to be set via $_GET );
- array( expected query vars to be set, same as 'qv' above )
- (string) expected redirect location
- [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
- */
</del><ins>+ /* Format:
+ * [0]: $test_url,
+ * [1]: expected results: Any of the following can be used
+ * array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
+ * array( expected query vars to be set, same as 'qv' above )
+ * (string) expected redirect location
+ * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
+ */
+ return array(
+ array( '/?p=123', '/?p=123' ),
</ins><span class="cx">
</span><del>- array( '/?p=123', '/?p=123' ),
</del><ins>+ array( '/?p=358 ', array('url' => '/?p=358', 'qv' => array('p' => '358') ) ), // Trailing spaces
+ array( '/?p=358%20', array('url' => '/?p=358', 'qv' => array('p' => '358') ) ),
</ins><span class="cx">
</span><del>- array( '/?p=358 ', array('url' => '/?p=358', 'qv' => array('p' => '358') ) ), // Trailing spaces
- array( '/?p=358%20', array('url' => '/?p=358', 'qv' => array('p' => '358') ) ),
</del><ins>+ // These Date rules use ?m= as the redirect as that's the style of Link WordPress creates for date based archives
+ array( '/?&year=2008', '/?m=2008' ), // Extra &
+ array( '/?year=2008&cat=', '/?m=2008' ), // Empty qv
+ array( '/?year=2008&cat=&monthnum=09', '/?m=200809' ), // Empty qv
+ array( '/?year=2008&monthnum=05', '/?m=200805' ),
</ins><span class="cx">
</span><del>- // These Date rules use ?m= as the redirect as that's the style of Link WordPress creates for date based archives
- array( '/?&year=2008', '/?m=2008' ), // Extra &
- array( '/?year=2008&cat=', '/?m=2008' ), // Empty qv
- array( '/?year=2008&cat=&monthnum=09', '/?m=200809' ), // Empty qv
- array( '/?year=2008&monthnum=05', '/?m=200805' ),
</del><ins>+ array( '/?page_id=1', '/?p=1' ), // redirect page_id to p (should cover page_id|p|attachment_id to one another
+ array( '/?page_id=1&post_type=revision', '/?p=1' ),
</ins><span class="cx">
</span><del>- array( '/?page_id=1', '/?p=1' ), // redirect page_id to p (should cover page_id|p|attachment_id to one another
- array( '/?page_id=1&post_type=revision', '/?p=1' ),
-
- );
</del><ins>+ );
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre>
</div>
</div>
</body>
</html>