From de7380b56eeed81dd46df2d8cf9de8cfa8871517 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sat, 2 Mar 2013 17:50:56 +0100 Subject: [PATCH] Change intval( User::getOption() ) to User::getIntOption() Also changed some getOption with int or bool cast Change-Id: Ia551a50e9de047c62be84065481fdf8c02e2ef96 --- includes/ImagePage.php | 2 +- includes/Pager.php | 2 +- includes/User.php | 2 +- includes/WebRequest.php | 2 +- includes/api/ApiBase.php | 2 +- includes/specials/SpecialNewpages.php | 2 +- includes/specials/SpecialRecentchanges.php | 4 ++-- includes/specials/SpecialUndelete.php | 4 ++-- includes/specials/SpecialUpload.php | 2 +- includes/specials/SpecialUserlogin.php | 2 +- includes/specials/SpecialWatchlist.php | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 0b814ecdd9..998d60745d 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -916,7 +916,7 @@ EOT public function getImageLimitsFromOption( $user, $optionName ) { global $wgImageLimits; - $option = intval( $user->getOption( $optionName ) ); + $option = $user->getIntOption( $optionName ); if ( !isset( $wgImageLimits[$option] ) ) { $option = User::getDefaultOption( $optionName ); } diff --git a/includes/Pager.php b/includes/Pager.php index 9e937e4f81..746b02eb2a 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -143,7 +143,7 @@ abstract class IndexPager extends ContextSource implements Pager { $this->mOffset = $this->mRequest->getText( 'offset' ); # Use consistent behavior for the limit options - $this->mDefaultLimit = intval( $this->getUser()->getOption( 'rclimit' ) ); + $this->mDefaultLimit = $this->getUser()->getIntOption( 'rclimit' ); if ( !$this->mLimit ) { // Don't override if a subclass calls $this->setLimit() in its constructor. list( $this->mLimit, /* $offset */ ) = $this->mRequest->getLimitOffset(); diff --git a/includes/User.php b/includes/User.php index fca203259a..2263caeb2c 100644 --- a/includes/User.php +++ b/includes/User.php @@ -2474,7 +2474,7 @@ class User { */ public function getStubThreshold() { global $wgMaxArticleSize; # Maximum article size, in Kb - $threshold = intval( $this->getOption( 'stubthreshold' ) ); + $threshold = $this->getIntOption( 'stubthreshold' ); if ( $threshold > $wgMaxArticleSize * 1024 ) { # If they have set an impossible value, disable the preference # so we can use the parser cache again. diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 50da049d3f..2195fbbd91 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -741,7 +741,7 @@ class WebRequest { $limit = 0; } if( ( $limit == 0 ) && ( $optionname != '' ) ) { - $limit = (int)$wgUser->getOption( $optionname ); + $limit = $wgUser->getIntOption( $optionname ); } if( $limit <= 0 ) { $limit = $deflimit; diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 6dd6a2b415..9e48e3a1a0 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -845,7 +845,7 @@ abstract class ApiBase extends ContextSource { ? 'watchdefault' : 'watchcreations'; } # Watch the article based on the user preference - return (bool)$this->getUser()->getOption( $userOption ); + return $this->getUser()->getBoolOption( $userOption ); case 'nochange': return $userWatching; diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 0499e57296..6e8e634516 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -53,7 +53,7 @@ class SpecialNewpages extends IncludableSpecialPage { $opts->add( 'hidepatrolled', $this->getUser()->getBoolOption( 'newpageshidepatrolled' ) ); $opts->add( 'hidebots', false ); $opts->add( 'hideredirs', true ); - $opts->add( 'limit', (int)$this->getUser()->getOption( 'rclimit' ) ); + $opts->add( 'limit', $this->getUser()->getIntOption( 'rclimit' ) ); $opts->add( 'offset', '' ); $opts->add( 'namespace', '0' ); $opts->add( 'username', '' ); diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 7ea3a949fc..2cc5f9ea87 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -42,8 +42,8 @@ class SpecialRecentChanges extends IncludableSpecialPage { public function getDefaultOptions() { $opts = new FormOptions(); - $opts->add( 'days', (int)$this->getUser()->getOption( 'rcdays' ) ); - $opts->add( 'limit', (int)$this->getUser()->getOption( 'rclimit' ) ); + $opts->add( 'days', $this->getUser()->getIntOption( 'rcdays' ) ); + $opts->add( 'limit', $this->getUser()->getIntOption( 'rclimit' ) ); $opts->add( 'from', '' ); $opts->add( 'hideminor', $this->getUser()->getBoolOption( 'hideminor' ) ); diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index afc41bf451..b6578a34a2 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -939,8 +939,8 @@ class SpecialUndelete extends SpecialPage { // source view for textual content $sourceView = Xml::element( 'textarea', array( 'readonly' => 'readonly', - 'cols' => intval( $user->getOption( 'cols' ) ), - 'rows' => intval( $user->getOption( 'rows' ) ) ), + 'cols' => $user->getIntOption( 'cols' ), + 'rows' => $user->getIntOption( 'rows' ) ), $content->getNativeData() . "\n" ); $previewButton = Xml::element( 'input', array( diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index c1505a0fad..a37f5fb3fe 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -953,7 +953,7 @@ class UploadForm extends HTMLForm { ? 'filereuploadsummary' : 'fileuploadsummary', 'default' => $this->mComment, - 'cols' => intval( $this->getUser()->getOption( 'cols' ) ), + 'cols' => $this->getUser()->getIntOption( 'cols' ), 'rows' => 8, ) ); diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 27701d4cff..634d06f8d1 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -747,7 +747,7 @@ class LoginForm extends SpecialPage { case self::SUCCESS: # We've verified now, update the real record $user = $this->getUser(); - if( (bool)$this->mRemember != (bool)$user->getOption( 'rememberpassword' ) ) { + if( (bool)$this->mRemember != $user->getBoolOption( 'rememberpassword' ) ) { $user->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 ); $user->saveSettings(); } else { diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index bf2d08bb6b..7114fc9593 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -226,7 +226,7 @@ class SpecialWatchlist extends SpecialPage { # Toggle watchlist content (all recent edits or just the latest) if( $values['extended'] ) { - $limitWatchlist = intval( $user->getOption( 'wllimit' ) ); + $limitWatchlist = $user->getIntOption( 'wllimit' ); $usePage = false; } else { # Top log Ids for a page are not stored -- 2.20.1