[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: onSpecialPage_initList get user from context & check type

2017-10-05 Thread Tobias Gritschacher (Code Review) 
Tobias Gritschacher has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382432 )

Change subject: onSpecialPage_initList get user from context & check type
..


onSpecialPage_initList get user from context & check type

Bug: T177468
Change-Id: I5eb721279bb9443922377d40cc9dbf0fee538898
---
M includes/TwoColConflictHooks.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved



diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index f59fdf4..5cef329 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -110,8 +110,7 @@
 * @return bool
 */
public static function onSpecialPage_initList( &$aSpecialPages ) {
-   global $wgUser;
-
+   $user = RequestContext::getMain()->getUser();
$config = MediaWikiServices::getInstance()->getMainConfig();
 
/**
@@ -121,7 +120,8 @@
if (
$config->get( 'TwoColConflictBetaFeature' ) &&
class_exists( BetaFeatures::class ) &&
-   !BetaFeatures::isFeatureEnabled( $wgUser, 
'twocolconflict' )
+   $user instanceof User &&
+   !BetaFeatures::isFeatureEnabled( $user, 
'twocolconflict' )
) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb721279bb9443922377d40cc9dbf0fee538898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
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...TwoColConflict[master]: onSpecialPage_initList get user from context & check type

2017-10-05 Thread Addshore (Code Review) 
Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382432 )

Change subject: onSpecialPage_initList get user from context & check type
..

onSpecialPage_initList get user from context & check type

Bug: T177468
Change-Id: I5eb721279bb9443922377d40cc9dbf0fee538898
---
M includes/TwoColConflictHooks.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/32/382432/1

diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index f59fdf4..5cef329 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -110,8 +110,7 @@
 * @return bool
 */
public static function onSpecialPage_initList( &$aSpecialPages ) {
-   global $wgUser;
-
+   $user = RequestContext::getMain()->getUser();
$config = MediaWikiServices::getInstance()->getMainConfig();
 
/**
@@ -121,7 +120,8 @@
if (
$config->get( 'TwoColConflictBetaFeature' ) &&
class_exists( BetaFeatures::class ) &&
-   !BetaFeatures::isFeatureEnabled( $wgUser, 
'twocolconflict' )
+   $user instanceof User &&
+   !BetaFeatures::isFeatureEnabled( $user, 
'twocolconflict' )
) {
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb721279bb9443922377d40cc9dbf0fee538898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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