Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use DatabaseBase::selectRowCount() in two more places

Browse source 
Change-Id: Ic6e03a96c03499f7d62539f12e677b4407def673
This commit is contained in:
Kevin Israel 2014-09-11 15:14:06 -04:00
parent 6cd7ac200c
commit 65f81d2843
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/Title.php
View file

@ -4098,12 +4098,11 @@ class Title {
'rev_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( $new->getTimestamp() ) )
);
if ( $max !== null ) {
$res = $dbr->select( 'revision', '1',
return $dbr->selectRowCount( 'revision', '1',
$conds,
__METHOD__,
array( 'LIMIT' => $max + 1 ) // extra to detect truncation
);
return $res->numRows();
} else {
return (int)$dbr->selectField( 'revision', 'count(*)', $conds, __METHOD__ );
}

5
includes/api/ApiQueryUserInfo.php
View file

@ -167,9 +167,9 @@ class ApiQueryUserInfo extends ApiQueryBase {
if ( isset( $this->prop['unreadcount'] ) ) {
$dbr = $this->getQuery()->getNamedDB( 'watchlist', DB_SLAVE, 'watchlist' );
$sql = $dbr->selectSQLText(
$count = $dbr->selectRowCount(
'watchlist',
array( 'dummy' => 1 ),
'1',
array(
'wl_user' => $user->getId(),
'wl_notificationtimestamp IS NOT NULL',
@ -177,7 +177,6 @@ class ApiQueryUserInfo extends ApiQueryBase {
__METHOD__,
array( 'LIMIT' => self::WL_UNREAD_LIMIT )
);
$count = $dbr->selectField( array( 'c' => "($sql)" ), 'COUNT(*)' );
if ( $count >= self::WL_UNREAD_LIMIT ) {
$vals['unreadcount'] = self::WL_UNREAD_LIMIT . '+';