[MediaWiki-commits] [Gerrit] mediawiki...Popups[wmf/1.30.0-wmf.14]: Remove aborting of BeforePageDisplay hook

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372593 )

Change subject: Remove aborting of BeforePageDisplay hook
..


Remove aborting of BeforePageDisplay hook

This caused random extensions to not be able to load any ResourceLoader
modules (or do other things) on a random subset of pages and wikis.

Follows-up 29770a3.

Bug: T173411
Change-Id: I8dfc1085cb7d902f9e9be8a71324dc4cd850a500
(cherry picked from commit 55f075bf11326bb29b162c958de8b3eef2073068)
---
M includes/PopupsHooks.php
1 file changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Pmiazga: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jdlrobson: Looks good to me, but someone else must approve



diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index d56bec5..ff6e952 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -108,27 +108,24 @@
 *
 * @param OutputPage &$out The Output page object
 * @param Skin &$skin  object that will be used to generate the 
page
-* @return bool
 */
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin ) {
$context = MediaWikiServices::getInstance()->getService( 
'Popups.Context' );
if ( $context->isTitleBlacklisted( $out->getTitle() ) ) {
-   return false;
+   return;
}
 
if ( !$context->areDependenciesMet() ) {
$logger = $context->getLogger();
$logger->error( 'Popups requires the PageImages and 
TextExtracts extensions. '
. 'If Beta mode is on it requires also 
BetaFeatures extension' );
-   return true;
+   return;
}
 
$user = $out->getUser();
if ( !$context->isBetaFeatureEnabled() || 
$context->shouldSendModuleToUser( $user ) ) {
$out->addModules( [ 'ext.popups' ] );
}
-
-   return true;
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/372593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dfc1085cb7d902f9e9be8a71324dc4cd850a500
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Popups[wmf/1.30.0-wmf.14]: Remove aborting of BeforePageDisplay hook

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372593 )

Change subject: Remove aborting of BeforePageDisplay hook
..

Remove aborting of BeforePageDisplay hook

This caused random extensions to not be able to load any ResourceLoader
modules (or do other things) on a random subset of pages and wikis.

Follows-up 29770a3.

Bug: T173411
Change-Id: I8dfc1085cb7d902f9e9be8a71324dc4cd850a500
(cherry picked from commit 55f075bf11326bb29b162c958de8b3eef2073068)
---
M includes/PopupsHooks.php
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/93/372593/1

diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index d56bec5..ff6e952 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -108,27 +108,24 @@
 *
 * @param OutputPage &$out The Output page object
 * @param Skin &$skin  object that will be used to generate the 
page
-* @return bool
 */
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin ) {
$context = MediaWikiServices::getInstance()->getService( 
'Popups.Context' );
if ( $context->isTitleBlacklisted( $out->getTitle() ) ) {
-   return false;
+   return;
}
 
if ( !$context->areDependenciesMet() ) {
$logger = $context->getLogger();
$logger->error( 'Popups requires the PageImages and 
TextExtracts extensions. '
. 'If Beta mode is on it requires also 
BetaFeatures extension' );
-   return true;
+   return;
}
 
$user = $out->getUser();
if ( !$context->isBetaFeatureEnabled() || 
$context->shouldSendModuleToUser( $user ) ) {
$out->addModules( [ 'ext.popups' ] );
}
-
-   return true;
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/372593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dfc1085cb7d902f9e9be8a71324dc4cd850a500
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits