]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-includes/rewrite.php
WordPress 4.1.4-scripts
[autoinstalls/wordpress.git] / wp-includes / rewrite.php
index 13808d14eee1530df62375385f21d32c197e79ad..9bc167f08f4b630aeb98fa733b91f58fc367850a 100644 (file)
@@ -89,7 +89,7 @@ function add_feed($feedname, $function) {
                $wp_rewrite->feeds[] = $feedname;
        $hook = 'do_feed_' . $feedname;
        // Remove default function hook
-       remove_action($hook, $hook, 10, 1);
+       remove_action($hook, $hook);
        add_action($hook, $function, 10, 1);
        return $hook;
 }
@@ -206,12 +206,19 @@ define('EP_AUTHORS', 2048);
  */
 define('EP_PAGES', 4096);
 
+/**
+ * Endpoint Mask for all archive views.
+ *
+ * @since 3.7.0
+ */
+define( 'EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS );
+
 /**
  * Endpoint Mask for everything.
  *
  * @since 2.1.0
  */
-define('EP_ALL', 8191);
+define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES );
 
 /**
  * Add an endpoint, like /trackback/.
@@ -219,22 +226,20 @@ define('EP_ALL', 8191);
  * Adding an endpoint creates extra rewrite rules for each of the matching
  * places specified by the provided bitmask. For example:
  *
- * <code>
- * add_rewrite_endpoint( 'json', EP_PERMALINK | EP_PAGES );
- * </code>
+ *     add_rewrite_endpoint( 'json', EP_PERMALINK | EP_PAGES );
  *
  * will add a new rewrite rule ending with "json(/(.*))?/?$" for every permastruct
  * that describes a permalink (post) or page. This is rewritten to "json=$match"
  * where $match is the part of the URL matched by the endpoint regex (e.g. "foo" in
- * "<permalink>/json/foo/").
+ * "[permalink]/json/foo/").
  *
  * A new query var with the same name as the endpoint will also be created.
  *
  * When specifying $places ensure that you are using the EP_* constants (or a
  * combination of them using the bitwise OR operator) as their values are not
- * guaranteed to remain static (especially EP_ALL).
+ * guaranteed to remain static (especially `EP_ALL`).
  *
- * Be sure to flush the rewrite rules - flush_rewrite_rules() - when your plugin gets
+ * Be sure to flush the rewrite rules - {@see flush_rewrite_rules()} - when your plugin gets
  * activated and deactivated.
  *
  * @since 2.1.0
@@ -243,10 +248,11 @@ define('EP_ALL', 8191);
  *
  * @param string $name Name of the endpoint.
  * @param int $places Endpoint mask describing the places the endpoint should be added.
+ * @param string $query_var Name of the corresponding query variable. Defaults to $name.
  */
-function add_rewrite_endpoint( $name, $places ) {
+function add_rewrite_endpoint( $name, $places, $query_var = null ) {
        global $wp_rewrite;
-       $wp_rewrite->add_endpoint( $name, $places );
+       $wp_rewrite->add_endpoint( $name, $places, $query_var );
 }
 
 /**
@@ -281,7 +287,14 @@ function _wp_filter_taxonomy_base( $base ) {
 function url_to_postid($url) {
        global $wp_rewrite;
 
-       $url = apply_filters('url_to_postid', $url);
+       /**
+        * Filter the URL to derive the post ID from.
+        *
+        * @since 2.2.0
+        *
+        * @param string $url The URL to derive the post ID from.
+        */
+       $url = apply_filters( 'url_to_postid', $url );
 
        // First, check to see if there is a 'p=N' or 'page_id=N' to match against
        if ( preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values) )       {
@@ -315,22 +328,28 @@ function url_to_postid($url) {
 
        // Strip 'index.php/' if we're not using path info permalinks
        if ( !$wp_rewrite->using_index_permalinks() )
-               $url = str_replace('index.php/', '', $url);
+               $url = str_replace( $wp_rewrite->index . '/', '', $url );
 
-       if ( false !== strpos($url, home_url()) ) {
-               // Chop off http://domain.com
+       if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
+               // Chop off http://domain.com/[path]
                $url = str_replace(home_url(), '', $url);
        } else {
                // Chop off /path/to/blog
-               $home_path = parse_url(home_url());
+               $home_path = parse_url( home_url( '/' ) );
                $home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
-               $url = str_replace($home_path, '', $url);
+               $url = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );
        }
 
        // Trim leading and lagging slashes
        $url = trim($url, '/');
 
        $request = $url;
+       $post_type_query_vars = array();
+
+       foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
+               if ( ! empty( $t->query_var ) )
+                       $post_type_query_vars[ $t->query_var ] = $post_type;
+       }
 
        // Look for matches.
        $request_match = $request;
@@ -341,10 +360,10 @@ function url_to_postid($url) {
                if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
                        $request_match = $url . '/' . $request;
 
-               if ( preg_match("!^$match!", $request_match, $matches) ) {
+               if ( preg_match("#^$match#", $request_match, $matches) ) {
 
                        if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
-                               // this is a verbose page match, lets check to be sure about it
+                               // This is a verbose page match, let's check to be sure about it.
                                if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
                                        continue;
                        }
@@ -358,16 +377,21 @@ function url_to_postid($url) {
 
                        // Filter out non-public query vars
                        global $wp;
-                       parse_str($query, $query_vars);
+                       parse_str( $query, $query_vars );
                        $query = array();
                        foreach ( (array) $query_vars as $key => $value ) {
-                               if ( in_array($key, $wp->public_query_vars) )
+                               if ( in_array( $key, $wp->public_query_vars ) ){
                                        $query[$key] = $value;
+                                       if ( isset( $post_type_query_vars[$key] ) ) {
+                                               $query['post_type'] = $post_type_query_vars[$key];
+                                               $query['name'] = $value;
+                                       }
+                               }
                        }
 
                        // Do the query
-                       $query = new WP_Query($query);
-                       if ( !empty($query->posts) && $query->is_singular )
+                       $query = new WP_Query( $query );
+                       if ( ! empty( $query->posts ) && $query->is_singular )
                                return $query->post->ID;
                        else
                                return 0;
@@ -545,7 +569,7 @@ class WP_Rewrite {
         * @access public
         * @var string
         */
-       var $index = 'index.php';
+       public $index = 'index.php';
 
        /**
         * Variable name to use for regex matches in the rewritten query.
@@ -628,7 +652,7 @@ class WP_Rewrite {
         * @access public
         * @var bool
         */
-       var $use_verbose_rules = false;
+       public $use_verbose_rules = false;
 
        /**
         * Could post permalinks be confused with those of pages?
@@ -640,13 +664,13 @@ class WP_Rewrite {
         * Now it tells {@link WP::parse_request()} to check if a URL matching the
         * page permastruct is actually a page before accepting it.
         *
-        * @link http://core.trac.wordpress.org/ticket/16687
+        * @link https://core.trac.wordpress.org/ticket/16687
         * @see WP_Rewrite::init()
         * @since 2.5.0
         * @access public
         * @var bool
         */
-       var $use_verbose_page_rules = true;
+       public $use_verbose_page_rules = true;
 
        /**
         * Rewrite tags that can be used in permalink structures.
@@ -737,7 +761,7 @@ class WP_Rewrite {
         *
         * @return bool True, if permalinks are enabled.
         */
-       function using_permalinks() {
+       public function using_permalinks() {
                return ! empty($this->permalink_structure);
        }
 
@@ -751,7 +775,7 @@ class WP_Rewrite {
         *
         * @return bool
         */
-       function using_index_permalinks() {
+       public function using_index_permalinks() {
                if ( empty($this->permalink_structure) )
                        return false;
 
@@ -772,7 +796,7 @@ class WP_Rewrite {
         *
         * @return bool
         */
-       function using_mod_rewrite_permalinks() {
+       public function using_mod_rewrite_permalinks() {
                if ( $this->using_permalinks() && ! $this->using_index_permalinks() )
                        return true;
                else
@@ -795,7 +819,7 @@ class WP_Rewrite {
         * @param int $number Index number.
         * @return string
         */
-       function preg_index($number) {
+       public function preg_index($number) {
                $match_prefix = '$';
                $match_suffix = '';
 
@@ -818,11 +842,12 @@ class WP_Rewrite {
         *
         * @return array Array of page URIs as first element and attachment URIs as second element.
         */
-       function page_uri_index() {
+       public function page_uri_index() {
                global $wpdb;
 
                //get pages in order of hierarchy, i.e. children after parents
-               $posts = get_page_hierarchy( $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'") );
+               $pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'");
+               $posts = get_page_hierarchy( $pages );
 
                // If we have no pages get out quick
                if ( !$posts )
@@ -859,7 +884,7 @@ class WP_Rewrite {
         *
         * @return array
         */
-       function page_rewrite_rules() {
+       public function page_rewrite_rules() {
                // the extra .? at the beginning prevents clashes with other regular expressions in the rules array
                $this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' );
 
@@ -884,9 +909,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return bool|string False on no permalink structure. Date permalink structure.
+        * @return string|false False on no permalink structure. Date permalink structure.
         */
-       function get_date_permastruct() {
+       public function get_date_permastruct() {
                if ( isset($this->date_structure) )
                        return $this->date_structure;
 
@@ -938,9 +963,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return bool|string False on failure. Year structure on success.
+        * @return false|string False on failure. Year structure on success.
         */
-       function get_year_permastruct() {
+       public function get_year_permastruct() {
                $structure = $this->get_date_permastruct();
 
                if ( empty($structure) )
@@ -963,9 +988,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return bool|string False on failure. Year/Month structure on success.
+        * @return false|string False on failure. Year/Month structure on success.
         */
-       function get_month_permastruct() {
+       public function get_month_permastruct() {
                $structure = $this->get_date_permastruct();
 
                if ( empty($structure) )
@@ -986,9 +1011,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return bool|string False on failure. Year/Month/Day structure on success.
+        * @return string|false False on failure. Year/Month/Day structure on success.
         */
-       function get_day_permastruct() {
+       public function get_day_permastruct() {
                return $this->get_date_permastruct();
        }
 
@@ -1005,7 +1030,7 @@ class WP_Rewrite {
         *
         * @return bool|string False on failure. Category permalink structure.
         */
-       function get_category_permastruct() {
+       public function get_category_permastruct() {
                return $this->get_extra_permastruct('category');
        }
 
@@ -1022,7 +1047,7 @@ class WP_Rewrite {
         *
         * @return bool|string False on failure. Tag permalink structure.
         */
-       function get_tag_permastruct() {
+       public function get_tag_permastruct() {
                return $this->get_extra_permastruct('post_tag');
        }
 
@@ -1035,7 +1060,7 @@ class WP_Rewrite {
         * @param string $name Permalink structure name.
         * @return string|bool False if not found. Permalink structure string.
         */
-       function get_extra_permastruct($name) {
+       public function get_extra_permastruct($name) {
                if ( empty($this->permalink_structure) )
                        return false;
 
@@ -1055,9 +1080,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return string|bool False if not found. Permalink structure string.
+        * @return string|false False if not found. Permalink structure string.
         */
-       function get_author_permastruct() {
+       public function get_author_permastruct() {
                if ( isset($this->author_structure) )
                        return $this->author_structure;
 
@@ -1081,9 +1106,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return string|bool False if not found. Permalink structure string.
+        * @return string|false False if not found. Permalink structure string.
         */
-       function get_search_permastruct() {
+       public function get_search_permastruct() {
                if ( isset($this->search_structure) )
                        return $this->search_structure;
 
@@ -1107,9 +1132,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return string|bool False if not found. Permalink structure string.
+        * @return string|false False if not found. Permalink structure string.
         */
-       function get_page_permastruct() {
+       public function get_page_permastruct() {
                if ( isset($this->page_structure) )
                        return $this->page_structure;
 
@@ -1133,9 +1158,9 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return string|bool False if not found. Permalink structure string.
+        * @return string|false False if not found. Permalink structure string.
         */
-       function get_feed_permastruct() {
+       public function get_feed_permastruct() {
                if ( isset($this->feed_structure) )
                        return $this->feed_structure;
 
@@ -1161,7 +1186,7 @@ class WP_Rewrite {
         *
         * @return string|bool False if not found. Permalink structure string.
         */
-       function get_comment_feed_permastruct() {
+       public function get_comment_feed_permastruct() {
                if ( isset($this->comment_feed_structure) )
                        return $this->comment_feed_structure;
 
@@ -1191,7 +1216,7 @@ class WP_Rewrite {
         * @param string $regex Regular expression to substitute the tag for in rewrite rules.
         * @param string $query String to append to the rewritten query. Must end in '='.
         */
-       function add_rewrite_tag( $tag, $regex, $query ) {
+       public function add_rewrite_tag( $tag, $regex, $query ) {
                $position = array_search( $tag, $this->rewritecode );
                if ( false !== $position && null !== $position ) {
                        $this->rewritereplace[ $position ] = $regex;
@@ -1223,7 +1248,7 @@ class WP_Rewrite {
         * @param bool $endpoints Should endpoints be applied to the generated rewrite rules? Default is true.
         * @return array Rewrite rule list.
         */
-       function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
+       public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
                //build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
                $feedregex2 = '';
                foreach ( (array) $this->feeds as $feed_name)
@@ -1246,7 +1271,7 @@ class WP_Rewrite {
                                //match everything after the endpoint name, but allow for nothing to appear there
                                $epmatch = $endpoint[1] . '(/(.*))?/?$';
                                //this will be appended on to the rest of the query for each dir
-                               $epquery = '&' . $endpoint[1] . '=';
+                               $epquery = '&' . $endpoint[2] . '=';
                                $ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
                        }
                }
@@ -1435,8 +1460,8 @@ class WP_Rewrite {
                                        if ( !empty($endpoints) ) {
                                                foreach ( (array) $ep_query_append as $regex => $ep ) {
                                                        if ( $ep[0] & EP_ATTACHMENT ) {
-                                                               $rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(2);
-                                                               $rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(2);
+                                                               $rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
+                                                               $rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
                                                        }
                                                }
                                        }
@@ -1493,7 +1518,7 @@ class WP_Rewrite {
         * @param bool $walk_dirs Optional, default is false. Whether to create list of directories to walk over.
         * @return array
         */
-       function generate_rewrite_rule($permalink_structure, $walk_dirs = false) {
+       public function generate_rewrite_rule($permalink_structure, $walk_dirs = false) {
                return $this->generate_rewrite_rules($permalink_structure, EP_NONE, false, false, false, $walk_dirs);
        }
 
@@ -1515,7 +1540,7 @@ class WP_Rewrite {
         *
         * @return array An associate array of matches and queries.
         */
-       function rewrite_rules() {
+       public function rewrite_rules() {
                $rewrite = array();
 
                if ( empty($this->permalink_structure) )
@@ -1525,8 +1550,11 @@ class WP_Rewrite {
                $home_path = parse_url( home_url() );
                $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
 
-               // Old feed files
-               $old_feed_files = array( '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old' );
+               // Old feed and service files
+               $deprecated_files = array(
+                       '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old',
+                       '.*wp-app\.php(/.*)?$' => $this->index . '?error=403',
+               );
 
                // Registration rules
                $registration_pages = array();
@@ -1536,36 +1564,105 @@ class WP_Rewrite {
                }
                $registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated
 
-               // Post
-               $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false, true, false, false );
-               $post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
+               // Post rewrite rules.
+               $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK );
 
-               // Date
+               /**
+                * Filter rewrite rules used for "post" archives.
+                *
+                * @since 1.5.0
+                *
+                * @param array $post_rewrite The rewrite rules for posts.
+                */
+               $post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite );
+
+               // Date rewrite rules.
                $date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
-               $date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
 
-               // Root
+               /**
+                * Filter rewrite rules used for date archives.
+                *
+                * Likely date archives would include /yyyy/, /yyyy/mm/, and /yyyy/mm/dd/.
+                *
+                * @since 1.5.0
+                *
+                * @param array $date_rewrite The rewrite rules for date archives.
+                */
+               $date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite );
+
+               // Root-level rewrite rules.
                $root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
-               $root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
-
-               // Comments
-               $comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, true, true, true, false);
-               $comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
 
-               // Search
+               /**
+                * Filter rewrite rules used for root-level archives.
+                *
+                * Likely root-level archives would include pagination rules for the homepage
+                * as well as site-wide post feeds (e.g. /feed/, and /feed/atom/).
+                *
+                * @since 1.5.0
+                *
+                * @param array $root_rewrite The root-level rewrite rules.
+                */
+               $root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite );
+
+               // Comments rewrite rules.
+               $comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, false, true, true, false);
+
+               /**
+                * Filter rewrite rules used for comment feed archives.
+                *
+                * Likely comments feed archives include /comments/feed/, and /comments/feed/atom/.
+                *
+                * @since 1.5.0
+                *
+                * @param array $comments_rewrite The rewrite rules for the site-wide comments feeds.
+                */
+               $comments_rewrite = apply_filters( 'comments_rewrite_rules', $comments_rewrite );
+
+               // Search rewrite rules.
                $search_structure = $this->get_search_permastruct();
                $search_rewrite = $this->generate_rewrite_rules($search_structure, EP_SEARCH);
-               $search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
 
-               // Authors
+               /**
+                * Filter rewrite rules used for search archives.
+                *
+                * Likely search-related archives include /search/search+query/ as well as
+                * pagination and feed paths for a search.
+                *
+                * @since 1.5.0
+                *
+                * @param array $search_rewrite The rewrite rules for search queries.
+                */
+               $search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite );
+
+               // Author rewrite rules.
                $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
-               $author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
 
-               // Pages
+               /**
+                * Filter rewrite rules used for author archives.
+                *
+                * Likely author archives would include /author/author-name/, as well as
+                * pagination and feed paths for author archives.
+                *
+                * @since 1.5.0
+                *
+                * @param array $author_rewrite The rewrite rules for author archives.
+                */
+               $author_rewrite = apply_filters( 'author_rewrite_rules', $author_rewrite );
+
+               // Pages rewrite rules.
                $page_rewrite = $this->page_rewrite_rules();
-               $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
 
-               // Extra permastructs
+               /**
+                * Filter rewrite rules used for "page" post type archives.
+                *
+                * @since 1.5.0
+                *
+                * @param array $page_rewrite The rewrite rules for the "page" post type.
+                */
+               $page_rewrite = apply_filters( 'page_rewrite_rules', $page_rewrite );
+
+               // Extra permastructs.
                foreach ( $this->extra_permastructs as $permastructname => $struct ) {
                        if ( is_array( $struct ) ) {
                                if ( count( $struct ) == 2 )
@@ -1576,21 +1673,57 @@ class WP_Rewrite {
                                $rules = $this->generate_rewrite_rules( $struct );
                        }
 
-                       $rules = apply_filters($permastructname . '_rewrite_rules', $rules);
-                       if ( 'post_tag' == $permastructname )
-                               $rules = apply_filters('tag_rewrite_rules', $rules);
+                       /**
+                        * Filter rewrite rules used for individual permastructs.
+                        *
+                        * The dynamic portion of the hook name, `$permastructname`, refers
+                        * to the name of the registered permastruct, e.g. 'post_tag' (tags),
+                        * 'category' (categories), etc.
+                        *
+                        * @since 3.1.0
+                        *
+                        * @param array $rules The rewrite rules generated for the current permastruct.
+                        */
+                       $rules = apply_filters( $permastructname . '_rewrite_rules', $rules );
+                       if ( 'post_tag' == $permastructname ) {
+
+                               /**
+                                * Filter rewrite rules used specifically for Tags.
+                                *
+                                * @since 2.3.0
+                                * @deprecated 3.1.0 Use 'post_tag_rewrite_rules' instead
+                                *
+                                * @param array $rules The rewrite rules generated for tags.
+                                */
+                               $rules = apply_filters( 'tag_rewrite_rules', $rules );
+                       }
 
                        $this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
                }
 
                // Put them together.
                if ( $this->use_verbose_page_rules )
-                       $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+                       $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
                else
-                       $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
-
-               do_action_ref_array('generate_rewrite_rules', array(&$this));
-               $this->rules = apply_filters('rewrite_rules_array', $this->rules);
+                       $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+
+               /**
+                * Fires after the rewrite rules are generated.
+                *
+                * @since 1.5.0
+                *
+                * @param WP_Rewrite $this Current WP_Rewrite instance, passed by reference.
+                */
+               do_action_ref_array( 'generate_rewrite_rules', array( &$this ) );
+
+               /**
+                * Filter the full set of generated rewrite rules.
+                *
+                * @since 1.5.0
+                *
+                * @param array $this->rules The compiled array of rewrite rules.
+                */
+               $this->rules = apply_filters( 'rewrite_rules_array', $this->rules );
 
                return $this->rules;
        }
@@ -1609,7 +1742,7 @@ class WP_Rewrite {
         *
         * @return array Rewrite rules.
         */
-       function wp_rewrite_rules() {
+       public function wp_rewrite_rules() {
                $this->rules = get_option('rewrite_rules');
                if ( empty($this->rules) ) {
                        $this->matches = 'matches';
@@ -1634,11 +1767,11 @@ class WP_Rewrite {
         *
         * @return string
         */
-       function mod_rewrite_rules() {
+       public function mod_rewrite_rules() {
                if ( ! $this->using_permalinks() )
                        return '';
 
-               $site_root = parse_url(get_option('siteurl'));
+               $site_root = parse_url( site_url() );
                if ( isset( $site_root['path'] ) )
                        $site_root = trailingslashit($site_root['path']);
 
@@ -1698,8 +1831,25 @@ class WP_Rewrite {
 
                $rules .= "</IfModule>\n";
 
-               $rules = apply_filters('mod_rewrite_rules', $rules);
-               $rules = apply_filters('rewrite_rules', $rules);  // Deprecated
+               /**
+                *
+                * Filter the list of rewrite rules formatted for output to an .htaccess file.
+                *
+                * @since 1.5.0
+                *
+                * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
+                */
+               $rules = apply_filters( 'mod_rewrite_rules', $rules );
+
+               /**
+                * Filter the list of rewrite rules formatted for output to an .htaccess file.
+                *
+                * @since 1.5.0
+                * @deprecated 1.5.0 Use the mod_rewrite_rules filter instead.
+                *
+                * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
+                */
+               $rules = apply_filters( 'rewrite_rules', $rules );  // Deprecated
 
                return $rules;
        }
@@ -1715,7 +1865,7 @@ class WP_Rewrite {
         *
         * @return string
         */
-       function iis7_url_rewrite_rules( $add_parent_tags = false ) {
+       public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
 
                if ( ! $this->using_permalinks() )
                        return '';
@@ -1726,75 +1876,17 @@ class WP_Rewrite {
                <rewrite>
                        <rules>';
                }
-               if ( !is_multisite() ) {
-                       $rules .= '
-                               <rule name="wordpress" patternSyntax="Wildcard">
-                                       <match url="*" />
-                                               <conditions>
-                                                       <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
-                                                       <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
-                                               </conditions>
-                                       <action type="Rewrite" url="index.php" />
-                               </rule>';
-               } else {
-                       if (is_subdomain_install()) {
-                               $rules .= '
-                               <rule name="wordpress - Rule 1" stopProcessing="true">
-                                       <match url="^index\.php$" ignoreCase="false" />
-                                       <action type="None" />
-                               </rule>
-                               <rule name="wordpress - Rule 2" stopProcessing="true">
-                                       <match url="^files/(.+)" ignoreCase="false" />
-                                       <action type="Rewrite" url="wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
-                               </rule>
-                               <rule name="wordpress - Rule 3" stopProcessing="true">
-                                       <match url="^" ignoreCase="false" />
-                                       <conditions logicalGrouping="MatchAny">
-                                               <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" />
-                                               <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" />
-                                       </conditions>
-                                       <action type="None" />
-                               </rule>
-                               <rule name="wordpress - Rule 4" stopProcessing="true">
-                                       <match url="." ignoreCase="false" />
-                                       <action type="Rewrite" url="index.php" />
-                               </rule>';
-                       } else {
-                               $rules .= '
-                               <rule name="wordpress - Rule 1" stopProcessing="true">
-                                       <match url="^index\.php$" ignoreCase="false" />
-                                       <action type="None" />
-                               </rule>
-                               <rule name="wordpress - Rule 2" stopProcessing="true">
-                                       <match url="^([_0-9a-zA-Z-]+/)?files/(.+)" ignoreCase="false" />
-                                       <action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" />
-                               </rule>
-                               <rule name="wordpress - Rule 3" stopProcessing="true">
-                                       <match url="^([_0-9a-zA-Z-]+/)?wp-admin$" ignoreCase="false" />
-                                       <action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" />
-                               </rule>
-                               <rule name="wordpress - Rule 4" stopProcessing="true">
-                                       <match url="^" ignoreCase="false" />
-                                       <conditions logicalGrouping="MatchAny">
-                                               <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" />
-                                               <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" />
+
+               $rules .= '
+                       <rule name="wordpress" patternSyntax="Wildcard">
+                               <match url="*" />
+                                       <conditions>
+                                               <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+                                               <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
                                        </conditions>
-                                       <action type="None" />
-                               </rule>
-                               <rule name="wordpress - Rule 5" stopProcessing="true">
-                                       <match url="^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" />
-                                       <action type="Rewrite" url="{R:1}" />
-                               </rule>
-                               <rule name="wordpress - Rule 6" stopProcessing="true">
-                                       <match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
-                                       <action type="Rewrite" url="{R:2}" />
-                               </rule>
-                               <rule name="wordpress - Rule 7" stopProcessing="true">
-                                       <match url="." ignoreCase="false" />
-                                       <action type="Rewrite" url="index.php" />
-                               </rule>';
-                       }
-               }
+                               <action type="Rewrite" url="index.php" />
+                       </rule>';
+
                if ( $add_parent_tags ) {
                        $rules .= '
                        </rules>
@@ -1803,7 +1895,14 @@ class WP_Rewrite {
 </configuration>';
                }
 
-               $rules = apply_filters('iis7_url_rewrite_rules', $rules);
+               /**
+                * Filter the list of rewrite rules formatted for output to a web.config.
+                *
+                * @since 2.8.0
+                *
+                * @param string $rules Rewrite rules formatted for IIS web.config.
+                */
+               $rules = apply_filters( 'iis7_url_rewrite_rules', $rules );
 
                return $rules;
        }
@@ -1821,7 +1920,7 @@ class WP_Rewrite {
         * @param string $redirect URL regex redirects to when regex matches request.
         * @param string $after Optional, default is bottom. Location to place rule.
         */
-       function add_rule($regex, $redirect, $after = 'bottom') {
+       public function add_rule($regex, $redirect, $after = 'bottom') {
                //get everything up to the first ?
                $index = (strpos($redirect, '?') == false ? strlen($redirect) : strpos($redirect, '?'));
                $front = substr($redirect, 0, $index);
@@ -1847,27 +1946,31 @@ class WP_Rewrite {
         * @param string $regex Regular expression to match against request.
         * @param string $redirect URL regex redirects to when regex matches request.
         */
-       function add_external_rule($regex, $redirect) {
+       public function add_external_rule($regex, $redirect) {
                $this->non_wp_rules[$regex] = $redirect;
        }
 
        /**
         * Add an endpoint, like /trackback/.
         *
-        * See {@link add_rewrite_endpoint()} for full documentation.
-        *
-        * @see add_rewrite_endpoint()
         * @since 2.1.0
+        * @since 3.9.0 $query_var parameter added.
         * @access public
+        *
+        * @see add_rewrite_endpoint() for full documentation.
         * @uses WP::add_query_var()
         *
-        * @param string $name Name of the endpoint.
-        * @param int $places Endpoint mask describing the places the endpoint should be added.
+        * @param string $name      Name of the endpoint.
+        * @param int    $places    Endpoint mask describing the places the endpoint should be added.
+        * @param string $query_var Name of the corresponding query variable. Default is value of $name.
         */
-       function add_endpoint($name, $places) {
+       public function add_endpoint( $name, $places, $query_var = null ) {
                global $wp;
-               $this->endpoints[] = array ( $places, $name );
-               $wp->add_query_var($name);
+               if ( null === $query_var ) {
+                       $query_var = $name;
+               }
+               $this->endpoints[] = array( $places, $name, $query_var );
+               $wp->add_query_var( $query_var );
        }
 
        /**
@@ -1898,7 +2001,7 @@ class WP_Rewrite {
         *                          rules built for each in turn? Default is true.
         *     - endpoints (bool) - Should endpoints be applied to the generated rewrite rules? Default is true.
         */
-       function add_permastruct( $name, $struct, $args = array() ) {
+       public function add_permastruct( $name, $struct, $args = array() ) {
                // backwards compatibility for the old parameters: $with_front and $ep_mask
                if ( ! is_array( $args ) )
                        $args = array( 'with_front' => $args );
@@ -1937,12 +2040,24 @@ class WP_Rewrite {
         * @access public
         * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
         */
-       function flush_rules($hard = true) {
+       public function flush_rules($hard = true) {
                delete_option('rewrite_rules');
                $this->wp_rewrite_rules();
-               if ( $hard && function_exists('save_mod_rewrite_rules') )
+               /**
+                * Filter whether a "hard" rewrite rule flush should be performed when requested.
+                *
+                * A "hard" flush updates .htaccess (Apache) or web.config (IIS).
+                *
+                * @since 3.7.0
+                *
+                * @param bool $hard Whether to flush rewrite rules "hard". Default true.
+                */
+               if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
+                       return;
+               }
+               if ( function_exists( 'save_mod_rewrite_rules' ) )
                        save_mod_rewrite_rules();
-               if ( $hard && function_exists('iis7_save_url_rewrite_rules') )
+               if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
                        iis7_save_url_rewrite_rules();
        }
 
@@ -1956,7 +2071,7 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         */
-       function init() {
+       public function init() {
                $this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
                $this->permalink_structure = get_option('permalink_structure');
                $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
@@ -1993,11 +2108,21 @@ class WP_Rewrite {
         *
         * @param string $permalink_structure Permalink structure.
         */
-       function set_permalink_structure($permalink_structure) {
+       public function set_permalink_structure($permalink_structure) {
                if ( $permalink_structure != $this->permalink_structure ) {
+                       $old_permalink_structure = $this->permalink_structure;
                        update_option('permalink_structure', $permalink_structure);
                        $this->init();
-                       do_action('permalink_structure_changed', $this->permalink_structure, $permalink_structure);
+
+                       /**
+                        * Fires after the permalink structure is updated.
+                        *
+                        * @since 2.8.0
+                        *
+                        * @param string $old_permalink_structure The previous permalink structure.
+                        * @param string $permalink_structure     The new permalink structure.
+                        */
+                       do_action( 'permalink_structure_changed', $old_permalink_structure, $permalink_structure );
                }
        }
 
@@ -2013,7 +2138,7 @@ class WP_Rewrite {
         *
         * @param string $category_base Category permalink structure base.
         */
-       function set_category_base($category_base) {
+       public function set_category_base($category_base) {
                if ( $category_base != get_option('category_base') ) {
                        update_option('category_base', $category_base);
                        $this->init();
@@ -2032,7 +2157,7 @@ class WP_Rewrite {
         *
         * @param string $tag_base Tag permalink structure base.
         */
-       function set_tag_base( $tag_base ) {
+       public function set_tag_base( $tag_base ) {
                if ( $tag_base != get_option( 'tag_base') ) {
                        update_option( 'tag_base', $tag_base );
                        $this->init();
@@ -2047,7 +2172,7 @@ class WP_Rewrite {
         *
         * @return WP_Rewrite
         */
-       function __construct() {
+       public function __construct() {
                $this->init();
        }
 }