X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWatchedItemQueryService.php;h=bc57049801fed421facfb695fed8540e680e9075;hb=dee457713b1b110bff1dc9985eabd487c5d8877c;hp=0c3d52a39fefd78ad0ed1108a413407172f5f205;hpb=6124d71e25c2894c3e025c20e81ff742045e8cd5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WatchedItemQueryService.php b/includes/WatchedItemQueryService.php
index 0c3d52a39f..bc57049801 100644
--- a/includes/WatchedItemQueryService.php
+++ b/includes/WatchedItemQueryService.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Linker\LinkTarget;
 use Wikimedia\Assert\Assert;
+use Wikimedia\Rdbms\LoadBalancer;
 
 /**
  * Class performing complex database queries related to WatchedItems.
@@ -401,7 +402,7 @@ class WatchedItemQueryService {
 		if ( !isset( $options['start'] ) && !isset( $options['end'] ) ) {
 			if ( $db->getType() === 'mysql' ) {
 				// This is an index optimization for mysql
-				$conds[] = "rc_timestamp > ''";
+				$conds[] = 'rc_timestamp > ' . $db->addQuotes( '' );
 			}
 		}
 
@@ -422,10 +423,7 @@ class WatchedItemQueryService {
 			$ownersToken = $watchlistOwner->getOption( 'watchlisttoken' );
 			$token = $options['watchlistOwnerToken'];
 			if ( $ownersToken == '' || !hash_equals( $ownersToken, $token ) ) {
-				throw new UsageException(
-					'Incorrect watchlist token provided -- please set a correct token in Special:Preferences',
-					'bad_wltoken'
-				);
+				throw ApiUsageException::newWithMessage( null, 'apierror-bad-watchlist-token', 'bad_wltoken' );
 			}
 			return $watchlistOwner->getId();
 		}
@@ -474,7 +472,7 @@ class WatchedItemQueryService {
 	}
 
 	private function getStartEndConds( IDatabase $db, array $options ) {
-		if ( !isset( $options['start'] ) && ! isset( $options['end'] ) ) {
+		if ( !isset( $options['start'] ) && !isset( $options['end'] ) ) {
 			return [];
 		}
 
@@ -507,7 +505,7 @@ class WatchedItemQueryService {
 			$conds[] = 'rc_user_text != ' . $db->addQuotes( $options['notByUser'] );
 		}
 
-		// Avoid brute force searches (bug 17342)
+		// Avoid brute force searches (T19342)
 		$bitmask = 0;
 		if ( !$user->isAllowed( 'deletedhistory' ) ) {
 			$bitmask = Revision::DELETED_USER;