[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix warning in DifferenceEngine

2017-09-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379340 )

Change subject: Fix warning in DifferenceEngine
..


Fix warning in DifferenceEngine

Make sure that the ar_namespace and ar_text fields are selected from the
database.

Change-Id: Ic2e8f99f43025510c14e0a8ff2b708b378cf7ef3
(cherry picked from commit 7a44c515808307150ea57c5f007ba48677132c47)
---
M includes/diff/DifferenceEngine.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index ed8cbb4..a9d6ad6 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -182,7 +182,10 @@
if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
$dbr = wfGetDB( DB_REPLICA );
$row = $dbr->selectRow( 'archive',
-   Revision::selectArchiveFields(),
+   array_merge(
+   Revision::selectArchiveFields(),
+   [ 'ar_namespace', 'ar_title' ]
+   ),
[ 'ar_rev_id' => $id ],
__METHOD__ );
if ( $row ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2e8f99f43025510c14e0a8ff2b708b378cf7ef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: Fix warning in DifferenceEngine

2017-09-20 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379340 )

Change subject: Fix warning in DifferenceEngine
..

Fix warning in DifferenceEngine

Make sure that the ar_namespace and ar_text fields are selected from the
database.

Change-Id: Ic2e8f99f43025510c14e0a8ff2b708b378cf7ef3
(cherry picked from commit 7a44c515808307150ea57c5f007ba48677132c47)
---
M includes/diff/DifferenceEngine.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/379340/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index ed8cbb4..a9d6ad6 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -182,7 +182,10 @@
if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
$dbr = wfGetDB( DB_REPLICA );
$row = $dbr->selectRow( 'archive',
-   Revision::selectArchiveFields(),
+   array_merge(
+   Revision::selectArchiveFields(),
+   [ 'ar_namespace', 'ar_title' ]
+   ),
[ 'ar_rev_id' => $id ],
__METHOD__ );
if ( $row ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2e8f99f43025510c14e0a8ff2b708b378cf7ef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Anomie 

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