Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/100519
Change subject: Load popup script in same place as personal url
......................................................................
Load popup script in same place as personal url
Also fixes a bug introduced in I72b419f06319d6b4a1e89647515ef1311ca48521
which only loaded the script for people who had it disabled.
Bug: 56392
Change-Id: Ic5c10791b5fa199e8132910c2e318da918daf6d9
---
M BetaFeatures.php
M BetaFeaturesHooks.php
2 files changed, 6 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures
refs/changes/19/100519/1
diff --git a/BetaFeatures.php b/BetaFeatures.php
index 07c6779..8eb3a27 100644
--- a/BetaFeatures.php
+++ b/BetaFeatures.php
@@ -41,7 +41,6 @@
$wgHooks['PersonalUrls'][] = 'BetaFeaturesHooks::getBetaFeaturesLink';
$wgHooks['UnitTestsList'][] = 'BetaFeaturesHooks::getUnitTestsList';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'BetaFeaturesHooks::getSchemaUpdates';
-$wgHooks['BeforePageDisplay'][] = 'BetaFeaturesHooks::loadPopupScript';
$wgHooks['MakeGlobalVariablesScript'][] =
'BetaFeaturesHooks::onMakeGlobalVariablesScript';
$wgJobClasses['updateBetaFeaturesUserCounts'] =
'UpdateBetaFeatureUserCountsJob';
diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index 6d2de7d..3ac16b5 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -332,7 +332,8 @@
* @return bool
*/
static function getBetaFeaturesLink( &$personal_urls, Title $title,
SkinTemplate $skintemplate ) {
- if ( $skintemplate->getUser()->isLoggedIn() ) {
+ $user = $skintemplate->getUser();
+ if ( $user->isLoggedIn() ) {
$personal_urls = wfArrayInsertAfter( $personal_urls,
array(
'betafeatures' => array(
'text' => wfMessage(
'betafeatures-toplink' )->text(),
@@ -340,6 +341,10 @@
'active' => $title->isSpecial(
'Preferences' ),
),
), 'preferences' );
+
+ if ( !$user->getOption( 'betafeatures-popup-disable' )
) {
+ $skintemplate->getOutput()->addModules(
'ext.betaFeatures.popup' );
+ }
}
return true;
@@ -365,17 +370,4 @@
return true;
}
- /**
- * @param OutputPage &$out
- * @param Skin &$skin
- * @return bool
- */
- static function loadPopupScript( OutputPage &$out, Skin &$skin ) {
- $user = $out->getUser();
- if ( $user->isLoggedIn() && $user->getOption(
'betafeatures-popup-disable' ) ) {
- $out->addModules( 'ext.betaFeatures.popup' );
- }
-
- return true;
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/100519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5c10791b5fa199e8132910c2e318da918daf6d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
