Changeset 36217

Timestamp:

01/07/2016 09:38:06 AM (10 years ago)

Author:

swissspidy

Message:

Rewrite: Add a remove_rewrite_tag() helper function.

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

Fixes #35236.

Location:

trunk

Files:

• src/wp-includes/class-wp-rewrite.php (modified) (1 diff)
• src/wp-includes/rewrite.php (modified) (1 diff)
• tests/phpunit/tests/rewrite/rewriteTags.php (added)

trunk/src/wp-includes/class-wp-rewrite.php

@@ -839 +839 @@
             $this->rewritereplace[] = $regex;
             $this->queryreplace[] = $query;
+        }
+    }
+
+
+    /**
+     * 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 ] );
         }
     }

trunk/src/wp-includes/rewrite.php

@@ -171 +171 @@
 
     $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 );
 }