From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 13 Sep 2017 14:59:19 +0000 (+0000)
Subject: Merge "Replace more problematic uses of "SELECT *""
X-Git-Tag: 1.31.0-rc.0~2121
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=311841a4f30c6be748dacf33e4ee5a79a27b0735;hp=f13ee14d2d488203989e432f48319ea2263f0b39;p=lhc%2Fweb%2Fwiklou.git

Merge "Replace more problematic uses of "SELECT *""
---

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 34f285235a..ed8cbb4ca3 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -181,7 +181,8 @@ class DifferenceEngine extends ContextSource {
 	public function deletedLink( $id ) {
 		if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
 			$dbr = wfGetDB( DB_REPLICA );
-			$row = $dbr->selectRow( 'archive', '*',
+			$row = $dbr->selectRow( 'archive',
+				Revision::selectArchiveFields(),
 				[ 'ar_rev_id' => $id ],
 				__METHOD__ );
 			if ( $row ) {
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 8aea7abade..96e7a7e7f9 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1129,11 +1129,9 @@ class LocalFile extends File {
 
 		if ( $this->historyLine == 0 ) { // called for the first time, return line from cur
 			$this->historyRes = $dbr->select( 'image',
-				[
-					'*',
-					"'' AS oi_archive_name",
-					'0 as oi_deleted',
-					'img_sha1'
+				self::selectFields() + [
+					'oi_archive_name' => $dbr->addQuotes( '' ),
+					'oi_deleted' => 0,
 				],
 				[ 'img_name' => $this->title->getDBkey() ],
 				$fname
@@ -1145,7 +1143,9 @@ class LocalFile extends File {
 				return false;
 			}
 		} elseif ( $this->historyLine == 1 ) {
-			$this->historyRes = $dbr->select( 'oldimage', '*',
+			$this->historyRes = $dbr->select(
+				'oldimage',
+				OldLocalFile::selectFields(),
 				[ 'oi_name' => $this->title->getDBkey() ],
 				$fname,
 				[ 'ORDER BY' => 'oi_timestamp DESC' ]