vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite: Add a remove_rewrite_tag() helper function.

Browse Source 
It can be used to properly remove registered rewrite tags. Adds unit tests.

Fixes #35236.

git-svn-id: https://develop.svn.wordpress.org/trunk@36217 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler
2016-01-07 09:38:06 +00:00
parent e5707af429
commit 79f2e50ca5
3 changed files with 163 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/wp-includes/class-wp-rewrite.php
View File

@@ -841,6 +841,28 @@ class WP_Rewrite {
}
}
/**
* Removes an existing rewrite tag.
*
* @since 4.5.0
* @access public
*
* @see WP_Rewrite::$rewritecode
* @see WP_Rewrite::$rewritereplace
* @see WP_Rewrite::$queryreplace
*
* @param string $tag Name of the rewrite tag to remove.
*/
public function remove_rewrite_tag( $tag ) {
$position = array_search( $tag, $this->rewritecode );
if ( false !== $position && null !== $position ) {
unset( $this->rewritecode[ $position ] );
unset( $this->rewritereplace[ $position ] );
unset( $this->queryreplace[ $position ] );
}
}
/**
* Generates rewrite rules from a permalink structure.
*

14
src/wp-includes/rewrite.php
View File

@@ -172,6 +172,20 @@ function add_rewrite_tag( $tag, $regex, $query = '' ) {
$wp_rewrite->add_rewrite_tag( $tag, $regex, $query );
}
/**
* Removes an existing rewrite tag (like %postname%).
*
* @since 4.5.0
*
* @global WP_Rewrite $wp_rewrite WordPress rewrite component.
*
* @param string $tag Name of the rewrite tag.
*/
function remove_rewrite_tag( $tag ) {
global $wp_rewrite;
$wp_rewrite->remove_rewrite_tag( $tag );
}
/**
* Add permalink structure.
*

127
tests/phpunit/tests/rewrite/rewriteTags.php Normal file
View File

@@ -0,0 +1,127 @@
<?php
/**
* @group rewrite
*/
class Tests_Rewrite_Tags extends WP_UnitTestCase {
protected $rewritecode;
protected $rewritereplace;
protected $queryreplace;
public function setUp() {
global $wp_rewrite;
$this->rewritecode = $wp_rewrite->rewritecode;
$this->rewritereplace = $wp_rewrite->rewritereplace;
$this->queryreplace = $wp_rewrite->queryreplace;
}
public function tearDown() {
global $wp_rewrite;
$wp_rewrite->rewritecode = $this->rewritecode;
$wp_rewrite->rewritereplace = $this->rewritereplace;
$wp_rewrite->queryreplace = $this->queryreplace;
}
public function _invalid_rewrite_tags() {
return array(
array( 'foo', 'bar' ),
array( '%', 'bar' ),
array( '%a', 'bar' ),
array( 'a%', 'bar' ),
array( '%%', 'bar' ),
array( '', 'bar' ),
);
}
/**
* @dataProvider _invalid_rewrite_tags
*
* @param string $tag Rewrite tag.
* @param string $regex Regex.
*/
public function test_add_rewrite_tag_invalid( $tag, $regex ) {
global $wp_rewrite;
add_rewrite_tag( $tag, $regex );
$this->assertNotContains( $tag, $wp_rewrite->rewritecode );
$this->assertNotContains( $regex, $wp_rewrite->rewritereplace );
$this->assertNotContains( $tag . '=', $wp_rewrite->queryreplace );
}
public function test_add_rewrite_tag_empty_query() {
global $wp_rewrite;
add_rewrite_tag( '%foo%', 'bar' );
$this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
$this->assertSame( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
$this->assertSame( array_merge( $this->queryreplace, array( 'foo=' ) ), $wp_rewrite->queryreplace );
}
public function test_add_rewrite_tag_custom_query() {
global $wp_rewrite;
add_rewrite_tag( '%foo%', 'bar', 'baz=' );
$this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
$this->assertSame( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
$this->assertSame( array_merge( $this->queryreplace, array( 'baz=' ) ), $wp_rewrite->queryreplace );
}
public function test_add_rewrite_tag_updates_existing() {
global $wp_rewrite;
add_rewrite_tag( '%pagename%', 'foo', 'bar=' );
$this->assertContains( '%pagename%', $wp_rewrite->rewritecode );
$this->assertContains( 'foo', $wp_rewrite->rewritereplace );
$this->assertNotContains( '([^/]+?)', $wp_rewrite->rewritereplace );
$this->assertContains( 'bar=', $wp_rewrite->queryreplace );
$this->assertNotContains( 'pagename=', $wp_rewrite->queryreplace );
}
public function test_remove_rewrite_tag() {
global $wp_rewrite;
add_rewrite_tag( '%foo%', 'bar', 'baz=' );
$this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
$this->assertSame( array_merge( $this->rewritereplace, array( 'bar' ) ), $wp_rewrite->rewritereplace );
$this->assertSame( array_merge( $this->queryreplace, array( 'baz=' ) ), $wp_rewrite->queryreplace );
remove_rewrite_tag( '%foo%' );
$this->assertSame( $this->rewritecode, $wp_rewrite->rewritecode );
$this->assertSame( $this->rewritereplace, $wp_rewrite->rewritereplace );
$this->assertSame( $this->queryreplace, $wp_rewrite->queryreplace );
}
public function test_remove_rewrite_tag_internal_tag() {
global $wp_rewrite;
$this->assertContains( '%post_id%', $wp_rewrite->rewritecode );
$this->assertContains( '([0-9]+)', $wp_rewrite->rewritereplace );
$this->assertContains( 'p=', $wp_rewrite->queryreplace );
remove_rewrite_tag( '%post_id%' );
$this->assertNotContains( '%post_id%', $wp_rewrite->rewritecode );
$this->assertNotContains( '([0-9]+)', $wp_rewrite->rewritereplace );
$this->assertNotContains( 'p=', $wp_rewrite->queryreplace );
}
public function test_remove_rewrite_tag_only_removes_one_array_value() {
global $wp_rewrite;
add_rewrite_tag( '%foo%', '([0-9]{1,2})', 'post_type=foo&name=' );
$this->assertSame( array_merge( $this->rewritecode, array( '%foo%' ) ), $wp_rewrite->rewritecode );
$this->assertSame( array_merge( $this->rewritereplace, array( '([0-9]{1,2})' ) ), $wp_rewrite->rewritereplace );
$this->assertSame( array_merge( $this->queryreplace, array( 'post_type=foo&name=' ) ), $wp_rewrite->queryreplace );
remove_rewrite_tag( '%foo%' );
$this->assertSame( $this->rewritecode, $wp_rewrite->rewritecode );
$this->assertSame( $this->rewritereplace, $wp_rewrite->rewritereplace );
$this->assertSame( $this->queryreplace, $wp_rewrite->queryreplace );
$this->assertNotContains( '%foo%', $wp_rewrite->rewritecode );
$this->assertContains( '([0-9]{1,2})', $wp_rewrite->rewritereplace );
$this->assertNotContains( 'post_type=foo&name=', $wp_rewrite->queryreplace );
}
}