[MediaWiki-commits] [Gerrit] Don't pass default pref as fallback to User::getOption() - change (mediawiki...PageImages)

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

Change subject: Don't pass default pref as fallback to User::getOption()
..


Don't pass default pref as fallback to User::getOption()

User::getOption() already handles that, and this code bypassed the hook
in User::getDefaultOptions().

Change-Id: I41f9df177988dffd62de0060cb691a97161729e4
---
M includes/PageImages.php
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/includes/PageImages.php b/includes/PageImages.php
index 0f76303..847db7d 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -155,7 +155,7 @@
 * @return bool
 */
public static function onInfoAction( IContextSource $context, 
&$pageInfo ) {
-   global $wgDefaultUserOptions, $wgThumbLimits;
+   global $wgThumbLimits;
 
$imageFile = self::getPageImage( $context->getTitle() );
if ( !$imageFile ) {
@@ -163,10 +163,7 @@
return true;
}
 
-   $thumbSetting = $context->getUser()->getOption(
-   'thumbsize',
-   $wgDefaultUserOptions['thumbsize']
-   );
+   $thumbSetting = $context->getUser()->getOption( 'thumbsize' );
$thumbSize = $wgThumbLimits[$thumbSetting];
 
$thumb = $imageFile->transform( array( 'width' => $thumbSize ) 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41f9df177988dffd62de0060cb691a97161729e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't pass default pref as fallback to User::getOption() - change (mediawiki...PageImages)

2016-01-26 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: Don't pass default pref as fallback to User::getOption()
..

Don't pass default pref as fallback to User::getOption()

User::getOption() already handles that, and this code bypassed the hook
in User::getDefaultOptions().

Change-Id: I41f9df177988dffd62de0060cb691a97161729e4
---
M includes/PageImages.php
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/40/266540/1

diff --git a/includes/PageImages.php b/includes/PageImages.php
index 0f76303..847db7d 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -155,7 +155,7 @@
 * @return bool
 */
public static function onInfoAction( IContextSource $context, 
&$pageInfo ) {
-   global $wgDefaultUserOptions, $wgThumbLimits;
+   global $wgThumbLimits;
 
$imageFile = self::getPageImage( $context->getTitle() );
if ( !$imageFile ) {
@@ -163,10 +163,7 @@
return true;
}
 
-   $thumbSetting = $context->getUser()->getOption(
-   'thumbsize',
-   $wgDefaultUserOptions['thumbsize']
-   );
+   $thumbSetting = $context->getUser()->getOption( 'thumbsize' );
$thumbSize = $wgThumbLimits[$thumbSetting];
 
$thumb = $imageFile->transform( array( 'width' => $thumbSize ) 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41f9df177988dffd62de0060cb691a97161729e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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