Merge "Enable $wgVectorUseIconWatch by default."

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

diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 09479bd..a53b901 100644 (file)
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -99,7 +99,6 @@ class SpecialPageFactory {
                'Listusers'                 => 'SpecialListUsers',
                'Listadmins'                => 'SpecialListAdmins',
                'Listbots'                  => 'SpecialListBots',
-               'Activeusers'               => 'SpecialActiveUsers',
                'Userrights'                => 'UserrightsPage',
                'EditWatchlist'             => 'SpecialEditWatchlist',
 
@@ -222,7 +221,7 @@ class SpecialPageFactory {
        /**
         * Initialise and return the list of special page aliases.  Returns an object with
         * properties which can be accessed $obj->pagename - each property is an array of
-        * aliases; the first in the array is the cannonical alias.  All registered special
+        * aliases; the first in the array is the canonical alias.  All registered special
         * pages are guaranteed to have a property entry, and for that property array to
         * contain at least one entry (English fallbacks will be added if necessary).
         * @return Object
@@ -312,7 +311,7 @@ class SpecialPageFactory {
        /**
         * Check if a given name exist as a special page or as a special page alias
         *
-        * @param $name String: name of a special page
+        * @param string $name name of a special page
         * @return Boolean: true if a special page exists with this name
         */
        public static function exists( $name ) {
@@ -323,7 +322,7 @@ class SpecialPageFactory {
        /**
         * Find the object with a given name and return it (or NULL)
         *
-        * @param $name String Special page name, may be localised and/or an alias
+        * @param string $name Special page name, may be localised and/or an alias
         * @return SpecialPage|null SpecialPage object or null if the page doesn't exist
         */
        public static function getPage( $name ) {
@@ -466,7 +465,7 @@ class SpecialPageFactory {
                                unset( $query['title'] );
                                $query = wfArrayToCgi( $query );
                                $title = $page->getTitle( $par );
-                               $url = $title->getFullUrl( $query );
+                               $url = $title->getFullURL( $query );
                                $context->getOutput()->redirect( $url );
                                wfProfileOut( __METHOD__ );
                                return $title;