jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403959 )
Change subject: Remove $user from Helpers::OresUiEnabled()
......................................................................
Remove $user from Helpers::OresUiEnabled()
It's not needed anymore as we removed beta feature check altogether
Bug: T184554
Change-Id: Ied075ea942bc0ae94b9ec630711afffa9a37f049
---
M includes/Hooks.php
M includes/Hooks/ChangesListHooksHandler.php
M includes/Hooks/ContributionsHooksHandler.php
M includes/Hooks/Helpers.php
M includes/Hooks/PreferencesHookHandler.php
5 files changed, 15 insertions(+), 22 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Kreuz (WMDE): Looks good to me, approved
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 73822a1..4601c82 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -118,7 +118,7 @@
* @param Skin &$skin
*/
public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
- if ( !Helpers::oresUiEnabled( $out->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
diff --git a/includes/Hooks/ChangesListHooksHandler.php
b/includes/Hooks/ChangesListHooksHandler.php
index f98b17d..1480931 100644
--- a/includes/Hooks/ChangesListHooksHandler.php
+++ b/includes/Hooks/ChangesListHooksHandler.php
@@ -36,7 +36,7 @@
public static function onChangesListSpecialPageStructuredFilters(
ChangesListSpecialPage $clsp
) {
- if ( !Helpers::oresUiEnabled( $clsp->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -374,9 +374,9 @@
$name, array &$tables, array &$fields, array &$conds,
array &$query_options, array &$join_conds, FormOptions $opts
) {
- global $wgUser, $wgRequest;
+ global $wgRequest;
- if ( !Helpers::oresUiEnabled( $wgUser ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -410,7 +410,7 @@
RCCacheEntry $rcObj,
array &$classes
) {
- if ( !Helpers::oresUiEnabled( $ecl->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -429,7 +429,7 @@
array &$data,
RCCacheEntry $rcObj
) {
- if ( !Helpers::oresUiEnabled( $ecl->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -476,7 +476,7 @@
RecentChange $rc,
array &$classes = []
) {
- if ( !Helpers::oresUiEnabled( $changesList->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
diff --git a/includes/Hooks/ContributionsHooksHandler.php
b/includes/Hooks/ContributionsHooksHandler.php
index 3b1f989..dfad764 100644
--- a/includes/Hooks/ContributionsHooksHandler.php
+++ b/includes/Hooks/ContributionsHooksHandler.php
@@ -36,7 +36,7 @@
ContribsPager $pager,
&$query
) {
- if ( !Helpers::oresUiEnabled( $pager->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -55,7 +55,7 @@
$row,
array &$flags
) {
- if ( !Helpers::oresUiEnabled( $context->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -84,7 +84,7 @@
$row,
array &$classes
) {
- if ( !Helpers::oresUiEnabled( $pager->getUser() ) ) {
+ if ( !Helpers::oresUiEnabled() ) {
return;
}
@@ -113,7 +113,7 @@
SpecialContributions $page,
array &$filters
) {
- if ( !Helpers::oresUiEnabled( $page->getUser() ) ||
!Helpers::isModelEnabled( 'damaging' ) ) {
+ if ( !Helpers::oresUiEnabled() || !Helpers::isModelEnabled(
'damaging' ) ) {
return;
}
diff --git a/includes/Hooks/Helpers.php b/includes/Hooks/Helpers.php
index fba1106..4a90337 100644
--- a/includes/Hooks/Helpers.php
+++ b/includes/Hooks/Helpers.php
@@ -109,7 +109,7 @@
public static function isDamagingFlagEnabled( IContextSource $context )
{
$user = $context->getUser();
- if ( !self::oresUiEnabled( $user ) ) {
+ if ( !self::oresUiEnabled() ) {
return false;
}
@@ -148,19 +148,12 @@
/**
* Check whether ores is enabled
*
- * @param User $user
* @return bool
*/
- public static function oresUiEnabled( User $user ) {
+ public static function oresUiEnabled() {
global $wgOresUiEnabled;
- // Is the UI enabled or not? If not, we've been deployed in
- // infrastructure-only mode, so hide all the UI elements.
- if ( !$wgOresUiEnabled ) {
- return false;
- }
-
- return true;
+ return (bool)$wgOresUiEnabled;
}
/**
diff --git a/includes/Hooks/PreferencesHookHandler.php
b/includes/Hooks/PreferencesHookHandler.php
index 61d6655..5c4e9c0 100644
--- a/includes/Hooks/PreferencesHookHandler.php
+++ b/includes/Hooks/PreferencesHookHandler.php
@@ -30,7 +30,7 @@
public static function onGetPreferences( User $user, array
&$preferences ) {
global $wgOresFiltersThresholds;
- if ( !Helpers::oresUiEnabled( $user ) ||
!Helpers::isModelEnabled( 'damaging' ) ) {
+ if ( !Helpers::oresUiEnabled() || !Helpers::isModelEnabled(
'damaging' ) ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/403959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied075ea942bc0ae94b9ec630711afffa9a37f049
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Thiemo Kreuz (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
