[MediaWiki-commits] [Gerrit] Account for unset visiting watchers - change (mediawiki/core)

2015-07-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Account for unset visiting watchers
..


Account for unset visiting watchers

Followup to 09a21c4af8dd53644edd31fe731638b60f91594a
Now with `|| $user->isAllowed( 'unwatchedpages' )` we can enter
line 337 without having any count to show.

Change-Id: I6826e1c59899d2c8cbbc6d079874d0d583f8783a
---
M includes/actions/InfoAction.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Brian Wolff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 6d43ec5..0c1a344 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -328,7 +328,10 @@
$this->msg( 'pageinfo-watchers' ),
$lang->formatNum( $pageCounts['watchers'] )
);
-   if ( $config->get( 'ShowUpdatedMarker' ) ) {
+   if (
+   $config->get( 'ShowUpdatedMarker' ) &&
+   isset( $pageCounts['visitingWatchers'] )
+   ) {
$minToDisclose = $config->get( 
'UnwatchedPageSecret' );
if ( $pageCounts['visitingWatchers'] > 
$minToDisclose ||
$user->isAllowed( 'unwatchedpages' ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6826e1c59899d2c8cbbc6d079874d0d583f8783a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Account for unset visiting watchers - change (mediawiki/core)

2015-07-01 Thread Nemo bis (Code Review) 
Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222101

Change subject: Account for unset visiting watchers
..

Account for unset visiting watchers

Now with `|| $user->isAllowed( 'unwatchedpages' )` we can enter
line 337 without having any count to show.

Change-Id: I6826e1c59899d2c8cbbc6d079874d0d583f8783a
---
M includes/actions/InfoAction.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/222101/1

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 6d43ec5..3fb31e3 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -328,7 +328,8 @@
$this->msg( 'pageinfo-watchers' ),
$lang->formatNum( $pageCounts['watchers'] )
);
-   if ( $config->get( 'ShowUpdatedMarker' ) ) {
+   if ( $config->get( 'ShowUpdatedMarker' ) &&
+   isset( $pageCounts['visitingWatchers'] ) ) {
$minToDisclose = $config->get( 
'UnwatchedPageSecret' );
if ( $pageCounts['visitingWatchers'] > 
$minToDisclose ||
$user->isAllowed( 'unwatchedpages' ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6826e1c59899d2c8cbbc6d079874d0d583f8783a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

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