wikimedia/mediawiki-extensions-Gadgets
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Gadgets synced 2024-11-15 03:23:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Can only use continue in a loop

Browse source
This commit is contained in:
Sam Reed 2010-10-29 21:36:49 +00:00
parent 3a82759a8a
commit df0b297e0c
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Gadgets.php
View file

@ -48,7 +48,9 @@ function wfGadgetsArticleSaveComplete( $article, $user, $text ) {
function wfLoadGadgets() { function wfLoadGadgets() {
static $gadgets = null; static $gadgets = null;
if ( $gadgets !== null ) return $gadgets; if ( $gadgets !== null ) {
return $gadgets;
}
$struct = wfLoadGadgetsStructured(); $struct = wfLoadGadgetsStructured();
if ( !$struct ) { if ( !$struct ) {
@ -57,7 +59,7 @@ function wfLoadGadgets() {
} }
$gadgets = array(); $gadgets = array();
foreach ( $struct as $section => $entries ) { foreach ( $struct as $entries ) {
$gadgets = array_merge( $gadgets, $entries ); $gadgets = array_merge( $gadgets, $entries );
} }
@ -68,7 +70,9 @@ function wfLoadGadgetsStructured( $forceNewText = null ) {
global $wgMemc; global $wgMemc;
static $gadgets = null; static $gadgets = null;
if ( $gadgets !== null && $forceNewText === null ) return $gadgets; if ( $gadgets !== null && $forceNewText === null ) {
return $gadgets;
}
$key = wfMemcKey( 'gadgets-definition' ); $key = wfMemcKey( 'gadgets-definition' );
@ -120,7 +124,9 @@ function wfLoadGadgetsStructured( $forceNewText = null ) {
function wfGadgetsGetPreferences( $user, &$preferences ) { function wfGadgetsGetPreferences( $user, &$preferences ) {
$gadgets = wfLoadGadgetsStructured(); $gadgets = wfLoadGadgetsStructured();
if (!$gadgets) return true; if (!$gadgets) {
return true;
}
$options = array(); $options = array();
foreach( $gadgets as $section => $thisSection ) { foreach( $gadgets as $section => $thisSection ) {
@ -162,7 +168,9 @@ function wfGadgetsGetPreferences( $user, &$preferences ) {
function wfGadgetsBeforePageDisplay( $out ) { function wfGadgetsBeforePageDisplay( $out ) {
global $wgUser; global $wgUser;
if ( !$wgUser->isLoggedIn() ) return true; if ( !$wgUser->isLoggedIn() ) {
return true;
}
//disable all gadgets on critical special pages //disable all gadgets on critical special pages
//NOTE: $out->isUserJsAllowed() is tempting, but always fals if $wgAllowUserJs is false. //NOTE: $out->isUserJsAllowed() is tempting, but always fals if $wgAllowUserJs is false.
@ -177,7 +185,9 @@ function wfGadgetsBeforePageDisplay( $out ) {
} }
$gadgets = wfLoadGadgets(); $gadgets = wfLoadGadgets();
if ( !$gadgets ) return true; if ( !$gadgets ) {
return true;
}
$lb = new LinkBatch(); $lb = new LinkBatch();
$lb->setCaller( __METHOD__ ); $lb->setCaller( __METHOD__ );
@ -197,7 +207,9 @@ function wfGadgetsBeforePageDisplay( $out ) {
$done = array(); $done = array();
foreach ( $pages as $page ) { foreach ( $pages as $page ) {
if ( isset( $done[$page] ) ) continue; if ( isset( $done[$page] ) ) {
continue;
}
$done[$page] = true; $done[$page] = true;
wfApplyGadgetCode( $page, $out ); wfApplyGadgetCode( $page, $out );
} }
@ -212,7 +224,9 @@ function wfApplyGadgetCode( $page, $out ) {
// but we'd want it to appear above explicit user stuff, so it can be overwritten. // but we'd want it to appear above explicit user stuff, so it can be overwritten.
$t = Title::makeTitleSafe( NS_MEDIAWIKI, "Gadget-$page" ); $t = Title::makeTitleSafe( NS_MEDIAWIKI, "Gadget-$page" );
if ( !$t ) continue; if ( !$t ) {
return;
}
if ( preg_match( '/\.js/', $page ) ) { if ( preg_match( '/\.js/', $page ) ) {
$u = $t->getLocalURL( 'action=raw&ctype=' . $wgJsMimeType ); $u = $t->getLocalURL( 'action=raw&ctype=' . $wgJsMimeType );