https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114853
Revision: 114853
Author: kaldari
Date: 2012-04-11 18:53:02 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
allow infinite scrolling override in both directions; realized we dont need to
cast the flag to a string before passing it to javascript since the raw boolean
works fine
Modified Paths:
--------------
trunk/extensions/PageTriage/SpecialPageTriage.php
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-11 18:41:19 UTC
(rev 114852)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-11 18:53:02 UTC
(rev 114853)
@@ -37,22 +37,17 @@
// Output the title of the page
$out->setPageTitle( wfMessage( 'pagetriage' ) );
- // Set whether or not to do infinite scrolling based on config
variable
- if ( is_bool( $wgPageTriageInfiniteScrolling ) ) {
- // Convert to string
- $infiniteScroll = $wgPageTriageInfiniteScrolling ?
"true" : "false";
- } else {
- $infiniteScroll = $wgPageTriageInfiniteScrolling;
+ // Allow infinite scrolling override from query string parameter
+ // We don't use getBool() here since the param is optional
+ if ( $wgRequest->getText( 'infinite' ) === 'true' ) {
+ $wgPageTriageInfiniteScrolling = true;
+ } else if ( $wgRequest->getText( 'infinite' ) === 'false' ) {
+ $wgPageTriageInfiniteScrolling = false;
}
- // Allow override from query string parameter
- if ( $wgRequest->getVal( 'infinite' ) ) {
- $infiniteScroll = true;
- }
-
// Set the infinite scrolling flag in JavaScript
$out->addScript( "<script
type=\"text/javascript\">mw.config.set({\"wgPageTriageInfiniteScrolling\":" .
- $infiniteScroll . "});</script>" );
+ $wgPageTriageInfiniteScrolling . "});</script>" );
// Load the JS
$out->addModules( array( 'ext.pageTriage.external',
'ext.pageTriage.models', 'ext.pageTriage.views.list' ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
