WordPress 4.5-scripts

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

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 4edcaf7307c749603364ca4844a1bb9d5ccf200a..1217f1c370d499fc1d4ca1ac59faf3cebda4ca3c 100644 (file)
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -15,7 +15,7 @@ class WP {
         * @access public
         * @var array
         */
         * @access public
         * @var array
         */

-       public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type');
+       public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );

 
        /**
         * Private query variables.
 
        /**
         * Private query variables.


@@ -23,14 +23,16 @@ class WP {
         * Long list of private query variables.
         *
         * @since 2.0.0
         * Long list of private query variables.
         *
         * @since 2.0.0

+        * @access public

         * @var array
         */
         * @var array
         */

-       public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in' );
+       public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title' );

 
        /**
         * Extra query variables set by the user.
         *
         * @since 2.1.0
 
        /**
         * Extra query variables set by the user.
         *
         * @since 2.1.0

+        * @access public

         * @var array
         */
        public $extra_query_vars = array();
         * @var array
         */
        public $extra_query_vars = array();


@@ -39,6 +41,7 @@ class WP {
         * Query variables for setting up the WordPress Query Loop.
         *
         * @since 2.0.0
         * Query variables for setting up the WordPress Query Loop.
         *
         * @since 2.0.0

+        * @access public

         * @var array
         */
        public $query_vars;
         * @var array
         */
        public $query_vars;


@@ -47,6 +50,7 @@ class WP {
         * String parsed to set the query variables.
         *
         * @since 2.0.0
         * String parsed to set the query variables.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $query_string;
         * @var string
         */
        public $query_string;


@@ -55,6 +59,7 @@ class WP {
         * Permalink or requested URI.
         *
         * @since 2.0.0
         * Permalink or requested URI.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $request;
         * @var string
         */
        public $request;


@@ -63,6 +68,7 @@ class WP {
         * Rewrite rule the request matched.
         *
         * @since 2.0.0
         * Rewrite rule the request matched.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $matched_rule;
         * @var string
         */
        public $matched_rule;


@@ -71,6 +77,7 @@ class WP {
         * Rewrite query the request matched.
         *
         * @since 2.0.0
         * Rewrite query the request matched.
         *
         * @since 2.0.0

+        * @access public

         * @var string
         */
        public $matched_query;
         * @var string
         */
        public $matched_query;


@@ -79,6 +86,7 @@ class WP {
         * Whether already did the permalink.
         *
         * @since 2.0.0
         * Whether already did the permalink.
         *
         * @since 2.0.0

+        * @access public

         * @var bool
         */
        public $did_permalink = false;
         * @var bool
         */
        public $did_permalink = false;


@@ -87,6 +95,7 @@ class WP {
         * Add name to list of public query variables.
         *
         * @since 2.1.0
         * Add name to list of public query variables.
         *
         * @since 2.1.0

+        * @access public

         *
         * @param string $qv Query variable name.
         */
         *
         * @param string $qv Query variable name.
         */


@@ -95,10 +104,23 @@ class WP {
                        $this->public_query_vars[] = $qv;
        }
 
                        $this->public_query_vars[] = $qv;
        }
 

+       /**
+        * Removes a query variable from a list of public query variables.
+        *
+        * @since 4.5.0
+        * @access public
+        *
+        * @param string $name Query variable name.
+        */
+       public function remove_query_var( $name ) {
+               $this->public_query_vars = array_diff( $this->public_query_vars, array( $name ) );
+       }
+

        /**
         * Set the value of a query variable.
         *
         * @since 2.3.0
        /**
         * Set the value of a query variable.
         *
         * @since 2.3.0

+        * @access public

         *
         * @param string $key Query variable name.
         * @param mixed $value Query variable value.
         *
         * @param string $key Query variable name.
         * @param mixed $value Query variable value.


@@ -114,6 +136,9 @@ class WP {
         * filters and actions that can be used to further manipulate the result.
         *
         * @since 2.0.0
         * filters and actions that can be used to further manipulate the result.
         *
         * @since 2.0.0

+        * @access public
+        *
+        * @global WP_Rewrite $wp_rewrite

         *
         * @param array|string $extra_query_vars Set the extra query variables.
         */
         *
         * @param array|string $extra_query_vars Set the extra query variables.
         */


@@ -135,11 +160,11 @@ class WP {
                $this->query_vars = array();
                $post_type_query_vars = array();
 
                $this->query_vars = array();
                $post_type_query_vars = array();
 

-               if ( is_array($extra_query_vars) )
+               if ( is_array( $extra_query_vars ) ) {

                        $this->extra_query_vars = & $extra_query_vars;
                        $this->extra_query_vars = & $extra_query_vars;

-               else if (! empty($extra_query_vars))
-                       parse_str($extra_query_vars, $this->extra_query_vars);
-
+               } elseif ( ! empty( $extra_query_vars ) ) {
+                       parse_str( $extra_query_vars, $this->extra_query_vars );
+               }

                // Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
                // Fetch the rewrite rules.
                // Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
                // Fetch the rewrite rules.


@@ -157,6 +182,7 @@ class WP {
                        list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
                        $self = $_SERVER['PHP_SELF'];
                        $home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
                        list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
                        $self = $_SERVER['PHP_SELF'];
                        $home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );

+                       $home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );

 
                        // Trim path info from the end and the leading home path from the
                        // front. For path info requests, this leaves us with the requesting
 
                        // Trim path info from the end and the leading home path from the
                        // front. For path info requests, this leaves us with the requesting


@@ -164,13 +190,13 @@ class WP {
                        // requested permalink.
                        $req_uri = str_replace($pathinfo, '', $req_uri);
                        $req_uri = trim($req_uri, '/');
                        // requested permalink.
                        $req_uri = str_replace($pathinfo, '', $req_uri);
                        $req_uri = trim($req_uri, '/');

-                       $req_uri = preg_replace("|^$home_path|i", '', $req_uri);
+                       $req_uri = preg_replace( $home_path_regex, '', $req_uri );

                        $req_uri = trim($req_uri, '/');
                        $pathinfo = trim($pathinfo, '/');
                        $req_uri = trim($req_uri, '/');
                        $pathinfo = trim($pathinfo, '/');

-                       $pathinfo = preg_replace("|^$home_path|i", '', $pathinfo);
+                       $pathinfo = preg_replace( $home_path_regex, '', $pathinfo );

                        $pathinfo = trim($pathinfo, '/');
                        $self = trim($self, '/');
                        $pathinfo = trim($pathinfo, '/');
                        $self = trim($self, '/');

-                       $self = preg_replace("|^$home_path|i", '', $self);
+                       $self = preg_replace( $home_path_regex, '', $self );

                        $self = trim($self, '/');
 
                        // The requested permalink is in $pathinfo for path info requests and
                        $self = trim($self, '/');
 
                        // The requested permalink is in $pathinfo for path info requests and


@@ -205,9 +231,17 @@ class WP {
                                                preg_match("#^$match#", urldecode($request_match), $matches) ) {
 
                                                if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
                                                preg_match("#^$match#", urldecode($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
-                                                       if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
+                                                       // This is a verbose page match, let's check to be sure about it.
+                                                       $page = get_page_by_path( $matches[ $varmatch[1] ] );
+                                                       if ( ! $page ) {

                                                                continue;
                                                                continue;

+                                                       }
+
+                                                       $post_status_obj = get_post_status_object( $page->post_status );
+                                                       if ( ! $post_status_obj->public && ! $post_status_obj->protected
+                                                               && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+                                                               continue;
+                                                       }

                                                }
 
                                                // Got a match.
                                                }
 
                                                // Got a match.


@@ -258,9 +292,11 @@ class WP {
                 */
                $this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
 
                 */
                $this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
 

-               foreach ( get_post_types( array(), 'objects' ) as $post_type => $t )
-                       if ( $t->query_var )
+               foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
+                       if ( is_post_type_viewable( $t ) && $t->query_var ) {

                                $post_type_query_vars[$t->query_var] = $post_type;
                                $post_type_query_vars[$t->query_var] = $post_type;

+                       }
+               }

 
                foreach ( $this->public_query_vars as $wpvar ) {
                        if ( isset( $this->extra_query_vars[$wpvar] ) )
 
                foreach ( $this->public_query_vars as $wpvar ) {
                        if ( isset( $this->extra_query_vars[$wpvar] ) )


@@ -295,6 +331,19 @@ class WP {
                        if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
                                $this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
 
                        if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
                                $this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
 

+               // Don't allow non-publicly queryable taxonomies to be queried from the front end.
+               if ( ! is_admin() ) {
+                       foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {
+                               /*
+                                * Disallow when set to the 'taxonomy' query var.
+                                * Non-publicly queryable taxonomies cannot register custom query vars. See register_taxonomy().
+                                */
+                               if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
+                                       unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
+                               }
+                       }
+               }
+

                // Limit publicly queried post_types to those that are publicly_queryable
                if ( isset( $this->query_vars['post_type']) ) {
                        $queryable_post_types = get_post_types( array('publicly_queryable' => true) );
                // Limit publicly queried post_types to those that are publicly_queryable
                if ( isset( $this->query_vars['post_type']) ) {
                        $queryable_post_types = get_post_types( array('publicly_queryable' => true) );


@@ -306,6 +355,9 @@ class WP {
                        }
                }
 
                        }
                }
 

+               // Resolve conflicts between posts with numeric slugs and date archive queries.
+               $this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+

                foreach ( (array) $this->private_query_vars as $var) {
                        if ( isset($this->extra_query_vars[$var]) )
                                $this->query_vars[$var] = $this->extra_query_vars[$var];
                foreach ( (array) $this->private_query_vars as $var) {
                        if ( isset($this->extra_query_vars[$var]) )
                                $this->query_vars[$var] = $this->extra_query_vars[$var];


@@ -334,15 +386,17 @@ class WP {
        }
 
        /**
        }
 
        /**

-        * Send additional HTTP headers for caching, content type, etc.
+        * Sends additional HTTP headers for caching, content type, etc.

         *
         *

-        * Sets the X-Pingback header, 404 status (if 404), Content-type. If showing
-        * a feed, it will also send last-modified, etag, and 304 status if needed.
+        * Sets the Content-Type header. Sets the 'error' status (if passed) and optionally exits.
+        * If showing a feed, it will also send Last-Modified, ETag, and 304 status if needed.

         *
         * @since 2.0.0
         *
         * @since 2.0.0

+        * @since 4.4.0 `X-Pingback` header is added conditionally after posts have been queried in handle_404().
+        * @access public

         */
        public function send_headers() {
         */
        public function send_headers() {

-               $headers = array('X-Pingback' => get_bloginfo('pingback_url'));
+               $headers = array();

                $status = null;
                $exit_required = false;
 
                $status = null;
                $exit_required = false;
 


@@ -357,9 +411,16 @@ class WP {
                        } elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
                                $exit_required = true;
                        }
                        } elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
                                $exit_required = true;
                        }

-               } else if ( empty($this->query_vars['feed']) ) {
+               } elseif ( empty( $this->query_vars['feed'] ) ) {

                        $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
                } else {
                        $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
                } else {

+                       // Set the correct content type for feeds
+                       $type = $this->query_vars['feed'];
+                       if ( 'feed' == $this->query_vars['feed'] ) {
+                               $type = get_default_feed();
+                       }
+                       $headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
+

                        // We're showing a feed, so WP is indeed the only thing that last changed
                        if ( !empty($this->query_vars['withcomments'])
                                || false !== strpos( $this->query_vars['feed'], 'comments-' )
                        // We're showing a feed, so WP is indeed the only thing that last changed
                        if ( !empty($this->query_vars['withcomments'])
                                || false !== strpos( $this->query_vars['feed'], 'comments-' )


@@ -432,7 +493,7 @@ class WP {
                        }
                }
 
                        }
                }
 

-               foreach( (array) $headers as $name => $field_value )
+               foreach ( (array) $headers as $name => $field_value )

                        @header("{$name}: {$field_value}");
 
                if ( $exit_required )
                        @header("{$name}: {$field_value}");
 
                if ( $exit_required )


@@ -455,6 +516,7 @@ class WP {
         * use the 'request' filter instead.
         *
         * @since 2.0.0
         * use the 'request' filter instead.
         *
         * @since 2.0.0

+        * @access public

         */
        public function build_query_string() {
                $this->query_string = '';
         */
        public function build_query_string() {
                $this->query_string = '';


@@ -488,15 +550,17 @@ class WP {
         * be taken when naming global variables that might interfere with the
         * WordPress environment.
         *
         * be taken when naming global variables that might interfere with the
         * WordPress environment.
         *

-        * @global string $query_string Query string for the loop.
-        * @global array $posts The found posts.
-        * @global WP_Post|null $post The current post, if available.
-        * @global string $request The SQL statement for the request.
-        * @global int $more Only set, if single page or post.
-        * @global int $single If single page or post. Only set, if single page or post.
-        * @global WP_User $authordata Only set, if author archive.
-        *

         * @since 2.0.0
         * @since 2.0.0

+        * @access public
+        *
+        * @global WP_Query     $wp_query
+        * @global string       $query_string Query string for the loop.
+        * @global array        $posts The found posts.
+        * @global WP_Post|null $post The current post, if available.
+        * @global string       $request The SQL statement for the request.
+        * @global int          $more Only set, if single page or post.
+        * @global int          $single If single page or post. Only set, if single page or post.
+        * @global WP_User      $authordata Only set, if author archive.

         */
        public function register_globals() {
                global $wp_query;
         */
        public function register_globals() {
                global $wp_query;


@@ -524,6 +588,7 @@ class WP {
         * Set up the current user.
         *
         * @since 2.0.0
         * Set up the current user.
         *
         * @since 2.0.0

+        * @access public

         */
        public function init() {
                wp_get_current_user();
         */
        public function init() {
                wp_get_current_user();


@@ -532,8 +597,10 @@ class WP {
        /**
         * Set up the Loop based on the query variables.
         *
        /**
         * Set up the Loop based on the query variables.
         *

-        * @uses WP::$query_vars

         * @since 2.0.0
         * @since 2.0.0

+        * @access public
+        *
+        * @global WP_Query $wp_the_query

         */
        public function query_posts() {
                global $wp_the_query;
         */
        public function query_posts() {
                global $wp_the_query;


@@ -542,7 +609,7 @@ class WP {
        }
 
        /**
        }
 
        /**

-        * Set the Headers for 404, if nothing is found for requested URL.
+        * Set the Headers for 404, if nothing is found for requested URL.

         *
         * Issue a 404 if a request doesn't match any posts and doesn't match
         * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
         *
         * Issue a 404 if a request doesn't match any posts and doesn't match
         * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already


@@ -550,19 +617,65 @@ class WP {
         *
         * Otherwise, issue a 200.
         *
         *
         * Otherwise, issue a 200.
         *

+        * This sets headers after posts have been queried. handle_404() really means "handle status."
+        * By inspecting the result of querying posts, seemingly successful requests can be switched to
+        * a 404 so that canonical redirection logic can kick in.
+        *

         * @since 2.0.0
         * @since 2.0.0

+     * @access public
+        *
+        * @global WP_Query $wp_query

         */
        public function handle_404() {
                global $wp_query;
 
         */
        public function handle_404() {
                global $wp_query;
 

+               /**
+                * Filter whether to short-circuit default header status handling.
+                *
+                * Returning a non-false value from the filter will short-circuit the handling
+                * and return early.
+                *
+                * @since 4.5.0
+                *
+                * @param bool     $preempt  Whether to short-circuit default header status handling. Default false.
+                * @param WP_Query $wp_query WordPress Query object.
+                */
+               if ( false !== apply_filters( 'pre_handle_404', false, $wp_query ) ) {
+                       return;
+               }
+

                // If we've already issued a 404, bail.
                if ( is_404() )
                        return;
 
                // Never 404 for the admin, robots, or if we found posts.
                if ( is_admin() || is_robots() || $wp_query->posts ) {
                // If we've already issued a 404, bail.
                if ( is_404() )
                        return;
 
                // Never 404 for the admin, robots, or if we found posts.
                if ( is_admin() || is_robots() || $wp_query->posts ) {

-                       status_header( 200 );
-                       return;
+
+                       $success = true;
+                       if ( is_singular() ) {
+                               $p = false;
+
+                               if ( $wp_query->post instanceof WP_Post ) {
+                                       $p = clone $wp_query->post;
+                               }
+
+                               // Only set X-Pingback for single posts that allow pings.
+                               if ( $p && pings_open( $p ) ) {
+                                       @header( 'X-Pingback: ' . get_bloginfo( 'pingback_url' ) );
+                               }
+
+                               // check for paged content that exceeds the max number of pages
+                               $next = '<!--nextpage-->';
+                               if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
+                                       $page = trim( $this->query_vars['page'], '/' );
+                                       $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+                               }
+                       }
+
+                       if ( $success ) {
+                               status_header( 200 );
+                               return;
+                       }

                }
 
                // We will 404 for paged queries, as no posts were found.
                }
 
                // We will 404 for paged queries, as no posts were found.


@@ -602,6 +715,7 @@ class WP {
         * object.
         *
         * @since 2.0.0
         * object.
         *
         * @since 2.0.0

+        * @access public

         *
         * @param string|array $query_args Passed to {@link parse_request()}
         */
         *
         * @param string|array $query_args Passed to {@link parse_request()}
         */


@@ -622,7 +736,6 @@ class WP {
                 */
                do_action_ref_array( 'wp', array( &$this ) );
        }
                 */
                do_action_ref_array( 'wp', array( &$this ) );
        }

-

 }
 
 /**
 }
 
 /**


@@ -662,80 +775,13 @@ class WP_MatchesMapRegex {
         */
        public $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
 
         */
        public $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
 

-       /**
-        * Make private properties readable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name Property to get.
-        * @return mixed Property.
-        */
-       public function __get( $name ) {
-               return $this->$name;
-       }
-
-       /**
-        * Make private properties settable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name  Property to set.
-        * @param mixed  $value Property value.
-        * @return mixed Newly-set property.
-        */
-       public function __set( $name, $value ) {
-               return $this->$name = $value;
-       }
-
-       /**
-        * Make private properties checkable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name Property to check if set.
-        * @return bool Whether the property is set.
-        */
-       public function __isset( $name ) {
-               return isset( $this->$name );
-       }
-
-       /**
-        * Make private properties un-settable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name Property to unset.
-        */
-       public function __unset( $name ) {
-               unset( $this->$name );
-       }
-
-       /**
-        * Make private/protected methods readable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param callable $name      Method to call.
-        * @param array    $arguments Arguments to pass when calling.
-        * @return mixed|bool Return value of the callback, false otherwise.
-        */
-       public function __call( $name, $arguments ) {
-               return call_user_func_array( array( $this, $name ), $arguments );
-       }
-

        /**
         * constructor
         *
         * @param string $subject subject if regex
         * @param array  $matches data to use in map
        /**
         * constructor
         *
         * @param string $subject subject if regex
         * @param array  $matches data to use in map

-        * @return self

         */
         */

-       public function WP_MatchesMapRegex($subject, $matches) {
+       public function __construct($subject, $matches) {

                $this->_subject = $subject;
                $this->_matches = $matches;
                $this->output = $this->_map();
                $this->_subject = $subject;
                $this->_matches = $matches;
                $this->output = $this->_map();


@@ -746,7 +792,9 @@ class WP_MatchesMapRegex {
         *
         * static helper function to ease use
         *
         *
         * static helper function to ease use
         *

+        * @static

         * @access public
         * @access public

+        *

         * @param string $subject subject
         * @param array  $matches data used for substitution
         * @return string
         * @param string $subject subject
         * @param array  $matches data used for substitution
         * @return string


@@ -778,5 +826,4 @@ class WP_MatchesMapRegex {
                $index = intval(substr($matches[0], 9, -1));
                return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
        }
                $index = intval(substr($matches[0], 9, -1));
                return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
        }

-

 }
 }