Tweak r45314: just return out

diff --git a/includes/Article.php b/includes/Article.php
index d7cde1c..591e558 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -846,8 +846,9 @@ class Article {
                        if( !$this->mTitle->userCanRead() ) {
                                $wgOut->loginToUse();
                                $wgOut->output();
+                               $wgOut->disable();
                                wfProfileOut( __METHOD__ );
-                               throw new MWException("Permission Error: you do not have access to view this page");
+                               return;
                        }
 
                        # We're looking at an old revision

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 9060f23..ce4ce67 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -52,7 +52,10 @@ class MediaWiki {
         */
        function initialize( &$title, &$article, &$output, &$user, $request ) {
                wfProfileIn( __METHOD__ );
-               $this->preliminaryChecks( $title, $output, $request );
+               if( !$this->preliminaryChecks( $title, $output, $request ) ) {
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
                if( !$this->initializeSpecialCases( $title, $output, $request ) ) {
                        $new_article = $this->initializeArticle( $title, $request );
                        if( is_object( $new_article ) ) {
@@ -145,8 +148,10 @@ class MediaWiki {
                if( !is_null( $title ) && !$title->userCanRead() ) {
                        $output->loginToUse();
                        $output->output();
-                       throw new MWException("Permission Error: you do not have access to view this page");
+                       $output->disable();
+                       return false;
                }
+               return true;
        }
 
        /**

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 048b0b3..b30ff19 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -151,8 +151,9 @@ CONTROL;
                if ( !$this->mOldPage->userCanRead() || !$this->mNewPage->userCanRead() ) {
                        $wgOut->loginToUse();
                        $wgOut->output();
+                       $wgOut->disable();
                        wfProfileOut( __METHOD__ );
-                       throw new MWException("Permission Error: you do not have access to view this page");
+                       return;
                }
 
                $sk = $wgUser->getSkin();