(bug 36524) "Show" options are now remembered between successive clicks.

[lhc/web/wiklou.git] / includes / specials / SpecialRecentchanges.php

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index a7a87f0..ec8f93b 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -633,14 +633,18 @@ class SpecialRecentChanges extends IncludableSpecialPage {
         */
        function setTopText( FormOptions $opts ) {
                global $wgContLang;
-               $this->getOutput()->addWikiText(
-                       Html::rawElement( 'p',
-                               array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ),
-                               "\n" . $this->msg( 'recentchangestext' )->inContentLanguage()->plain() . "\n"
-                       ), 
-                       /* $lineStart */ false,
-                       /* $interface */ false
-               );
+
+               $message = $this->msg( 'recentchangestext' )->inContentLanguage();
+               if ( !$message->isDisabled() ) {
+                       $this->getOutput()->addWikiText(
+                               Html::rawElement( 'p',
+                                       array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ),
+                                       "\n" . $message->plain() . "\n"
+                               ),
+                               /* $lineStart */ false,
+                               /* $interface */ false
+                       );
+               }
        }
 
        /**
@@ -768,6 +772,16 @@ class SpecialRecentChanges extends IncludableSpecialPage {
         */
        function makeOptionsLink( $title, $override, $options, $active = false ) {
                $params = $override + $options;
+
+               // Bug 36524: false values have be converted to "0" otherwise
+               // wfArrayToCgi() will omit it them.
+               foreach ( $params as &$value ) {
+                       if ( $value === false ) {
+                               $value = '0';
+                       }
+               }
+               unset( $value );
+
                $text = htmlspecialchars( $title );
                if ( $active ) {
                        $text = '<strong>' . $text . '</strong>';