Back out r41548 "Classes derived from SpecialPage can now specify a run() method...

It's unclear what benefit this brings, and the magic calling is scary and icky.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 59d6345..d78a192 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -145,8 +145,6 @@ The following extensions are migrated into MediaWiki 1.14:
   $wgExternalLinkTarget
 * api.php now sends "Retry-After" and "X-Database-Lag" HTTP headers if the maxlag
   check fails, just like index.php does
-* Classes derived from SpecialPage can now specify a run() method, which will
-  be executed after all magic performed by SpecialPage::execute()
 
 
 === Bug fixes in 1.14 ===

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index b96ab67..fec6c0a 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -740,13 +740,8 @@ class SpecialPage
                if ( $this->userCanExecute( $wgUser ) ) {
                        $func = $this->mFunction;
                        // only load file if the function does not exist
-                       if ( !is_callable( $func ) ) {
-                               // Check whether a run method has been defined
-                               if ( is_callable( array( $this, 'run' ) ) )
-                                       $func = array( $this, 'run' );
-                               // Else load from file if it has been specified
-                               elseif ( $this->mFile )
-                                       require_once( $this->mFile );
+                       if(!is_callable($func) and $this->mFile) {
+                               require_once( $this->mFile );
                        }
                        # FIXME: these hooks are broken for extensions and anything else that subclasses SpecialPage.
                        if ( wfRunHooks( 'SpecialPageExecuteBeforeHeader', array( &$this, &$par, &$func ) ) )
@@ -761,7 +756,6 @@ class SpecialPage
                }
        }
 
-
        function outputHeader() {
                global $wgOut, $wgContLang;