Merged localisation-work branch:

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

diff --git a/includes/Exception.php b/includes/Exception.php
index 9b04611..027c5d3 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -3,7 +3,8 @@
 class MWException extends Exception
 {
        function useOutputPage() {
-               return !empty( $GLOBALS['wgFullyInitialised'] );
+               return !empty( $GLOBALS['wgFullyInitialised'] ) && 
+                       !empty( $GLOBALS['wgArticle'] ) && !empty( $GLOBALS['wgTitle'] );
        }
 
        function useMessageCache() {