Merge "Enable $wgVectorUseIconWatch by default."

[lhc/web/wiklou.git] / includes / PathRouter.php

diff --git a/includes/PathRouter.php b/includes/PathRouter.php
index a80e04b..fc891bb 100644 (file)
--- a/includes/PathRouter.php
+++ b/includes/PathRouter.php
@@ -1,4 +1,25 @@
 <?php
+/**
+ * Parser to extract query parameters out of REQUEST_URI paths.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
 /**
  * PathRouter class.
  * This class can take patterns such as /wiki/$1 and use them to
@@ -132,9 +153,9 @@ class PathRouter {
        /**
         * Add a new path pattern to the path router
         *
-        * @param $path string|array The path pattern to add
-        * @param $params array The params for this path pattern
-        * @param $options array The options for this path pattern
+        * @param string|array $path The path pattern to add
+        * @param array $params The params for this path pattern
+        * @param array $options The options for this path pattern
         */
        public function add( $path, $params = array(), $options = array() ) {
                if ( is_array( $path ) ) {
@@ -211,7 +232,7 @@ class PathRouter {
        /**
         * Parse a path and return the query matches for the path
         *
-        * @param $path string The path to parse
+        * @param string $path The path to parse
         * @return Array The array of matches for the path
         */
        public function parse( $path ) {
@@ -272,7 +293,7 @@ class PathRouter {
                        foreach ( $m as $matchKey => $matchValue ) {
                                if ( preg_match( '/^par\d+$/u', $matchKey ) ) {
                                        $n = intval( substr( $matchKey, 3 ) );
-                                       $data['$'.$n] = rawurldecode( $matchValue );
+                                       $data['$' . $n] = rawurldecode( $matchValue );
                                }
                        }
                        // If present give our $data array a $key as well