Merge "Enable $wgVectorUseIconWatch by default."

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

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index c32738f..46d4304 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -1090,7 +1090,7 @@ abstract class RedirectSpecialPage extends UnlistedSpecialPage {
                $query = $this->getRedirectQuery();
                // Redirect to a page title with possible query parameters
                if ( $redirect instanceof Title ) {
-                       $url = $redirect->getFullUrl( $query );
+                       $url = $redirect->getFullURL( $query );
                        $this->getOutput()->redirect( $url );
                        return $redirect;
                // Redirect to index.php with query parameters
@@ -1100,7 +1100,7 @@ abstract class RedirectSpecialPage extends UnlistedSpecialPage {
                        $this->getOutput()->redirect( $url );
                        return $redirect;
                } else {
-                       $class = __CLASS__;
+                       $class = get_class( $this );
                        throw new MWException( "RedirectSpecialPage $class doesn't redirect!" );
                }
        }