WordPress 4.2

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

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index f8b3f8275345566f06e8e1a0456de14bbb9cbc75..a079c122d5a0b895f4f1171d285c106ab8523a36 100644 (file)
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -135,11 +135,11 @@ class WP {
                $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;
-               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.
@@ -357,7 +357,7 @@ class WP {
                        } 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 {
                        // We're showing a feed, so WP is indeed the only thing that last changed
@@ -541,7 +541,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
@@ -661,80 +661,13 @@ class WP_MatchesMapRegex {
         */
        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
-        * @return self
         */
-       public function WP_MatchesMapRegex($subject, $matches) {
+       public function __construct($subject, $matches) {
                $this->_subject = $subject;
                $this->_matches = $matches;
                $this->output = $this->_map();