Merge "bug 37015: Allow disabling special page summary"

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 7a6c0be..9e6717f 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -626,7 +626,7 @@ class SpecialPage {
                } else {
                        $msg = $summaryMessageKey;
                }
-               if ( !$this->msg( $msg )->isBlank() && !$this->including() ) {
+               if ( !$this->msg( $msg )->isDisabled() && !$this->including() ) {
                        $this->getOutput()->wrapWikiMsg(
                                "<div class='mw-specialpage-summary'>\n$1\n</div>", $msg );
                }

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 46dd115..bb384d4 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -635,7 +635,7 @@ class SpecialRecentChanges extends IncludableSpecialPage {
                global $wgContLang;
 
                $message = $this->msg( 'recentchangestext' )->inContentLanguage();
-               if ( $message->exists() ) {
+               if ( !$message->isDisabled() ) {
                        $this->getOutput()->addWikiText(
                                Html::rawElement( 'p',
                                        array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ),