WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / class-wp-rewrite.php

diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 1773929e5534bef3c37a8bccde7950be119e641f..7c621fb001efdbb8c118adc1e91734afe1775ea2 100644 (file)
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -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.
         *
        /**
         * Generates rewrite rules from a permalink structure.
         *


@@ -1000,6 +1022,10 @@ class WP_Rewrite {
                        $feedmatch2 = $match . $feedregex2;
                        $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
 
                        $feedmatch2 = $match . $feedregex2;
                        $feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
 

+                       // Create query and regex for embeds.
+                       $embedmatch = $match . $embedregex;
+                       $embedquery = $embedindex . '?' . $query . '&embed=true';
+

                        // If asked to, turn the feed queries into comment feed ones.
                        if ( $forcomments ) {
                                $feedquery .= '&withcomments=1';
                        // If asked to, turn the feed queries into comment feed ones.
                        if ( $forcomments ) {
                                $feedquery .= '&withcomments=1';


@@ -1011,7 +1037,7 @@ class WP_Rewrite {
 
                        // ...adding on /feed/ regexes => queries
                        if ( $feed ) {
 
                        // ...adding on /feed/ regexes => queries
                        if ( $feed ) {

-                               $rewrite = array( $feedmatch => $feedquery, $feedmatch2 => $feedquery2 );
+                               $rewrite = array( $feedmatch => $feedquery, $feedmatch2 => $feedquery2, $embedmatch => $embedquery );

                        }
 
                        //...and /page/xx ones
                        }
 
                        //...and /page/xx ones


@@ -1552,7 +1578,9 @@ class WP_Rewrite {
         * @since 2.8.0
         * @access public
         *
         * @since 2.8.0
         * @access public
         *

-        * @return string
+        * @param bool $add_parent_tags Optional. Whether to add parent tags to the rewrite rule sets.
+        *                              Default false.
+        * @return string IIS7 URL rewrite rule sets.

         */
        public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
                if ( ! $this->using_permalinks() )
         */
        public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
                if ( ! $this->using_permalinks() )


@@ -1566,7 +1594,7 @@ class WP_Rewrite {
                }
 
                $rules .= '
                }
 
                $rules .= '

-                       <rule name="wordpress" patternSyntax="Wildcard">
+                       <rule name="WordPress: ' . esc_attr( home_url() ) . '" patternSyntax="Wildcard">

                                <match url="*" />
                                        <conditions>
                                                <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
                                <match url="*" />
                                        <conditions>
                                                <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />


@@ -1742,6 +1770,18 @@ class WP_Rewrite {
                $this->extra_permastructs[ $name ] = $args;
        }
 
                $this->extra_permastructs[ $name ] = $args;
        }
 

+       /**
+        * Removes a permalink structure.
+        *
+        * @since 4.5.0
+        * @access public
+        *
+        * @param string $name Name for permalink structure.
+        */
+       public function remove_permastruct( $name ) {
+               unset( $this->extra_permastructs[ $name ] );
+       }
+

        /**
         * Removes rewrite rules and then recreate rewrite rules.
         *
        /**
         * Removes rewrite rules and then recreate rewrite rules.
         *


@@ -1770,7 +1810,7 @@ class WP_Rewrite {
                        unset( $do_hard_later );
                }
 
                        unset( $do_hard_later );
                }
 

-               delete_option('rewrite_rules');
+               update_option( 'rewrite_rules', '' );

                $this->wp_rewrite_rules();
 
                /**
                $this->wp_rewrite_rules();
 
                /**