Merge "Fix for chunked uploading support in API."

diff --git a/includes/PathRouter.php b/includes/PathRouter.php
index 29df4b4..9700b90 100644 (file)
--- a/includes/PathRouter.php
+++ b/includes/PathRouter.php
@@ -123,7 +123,7 @@ class PathRouter {
        /**
         * Add a new path pattern to the path router
         *
-        * @param $path string The path pattern to add
+        * @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
         */
@@ -348,4 +348,4 @@ class PathRouterPatternReplacer {
                }
        }
 
-}
\ No newline at end of file
+}

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index fda12f9..5d76cdf 100644 (file)
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -101,7 +101,10 @@ abstract class Maintenance {
        // Generic options which might or not be supported by the script
        private $mDependantParameters = array();
 
-       // Used by getDD() / setDB()
+       /**
+        * Used by getDD() / setDB()
+        * @var DatabaseBase
+        */
        private $mDb = null;
 
        /**