[MediaWiki-commits] [Gerrit] mediawiki...SimpleChanges[REL1_29]: Fix for bug in $wgSimpleChangesOnlyLatest handling with Medi...

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

Change subject: Fix for bug in $wgSimpleChangesOnlyLatest handling with 
MediaWiki 1.29
..


Fix for bug in $wgSimpleChangesOnlyLatest handling with MediaWiki 1.29

* See bug report here: https://www.mediawiki.org/wiki/Topic:Tv1tm9gz02bn1we9
* Fix is simply inserting our code later in the query building

Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
(cherry picked from commit 1528e85dc708577fa79334f1a9cf592612097ee7)

Causing issues on 1.29, should be therefore backported.

Change-Id: Idf7744131c0ab2b954fd29b291f14d67e4cabaf5
---
M SpecialSimpleChanges.php
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Zppix: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  tosfos: Looks good to me, approved



diff --git a/SpecialSimpleChanges.php b/SpecialSimpleChanges.php
index 0c41802..3ba26bb 100644
--- a/SpecialSimpleChanges.php
+++ b/SpecialSimpleChanges.php
@@ -14,12 +14,11 @@
 *
 * @inheritdoc
 */
-   protected function buildQuery( &$tables, &$fields, &$conds,
-   &$query_options, &$join_conds, FormOptions $opts ) {
+   protected function runMainQueryHook( &$tables, &$fields, &$conds, 
&$query_options, &$join_conds,
+   $opts
+   ) {
 
global $wgContentNamespaces, 
$wgSimpleChangesOnlyContentNamespaces, $wgSimpleChangesOnlyLatest;
-
-   parent::buildQuery( $tables, $fields, $conds, $query_options, 
$join_conds, $opts );
 
# don't count log entries toward limit of number of changes 
displayed
$conds[] = 'rc_type != ' . RC_LOG;
@@ -45,6 +44,8 @@
$join_conds['page'] = array( 'LEFT JOIN', 
'rc_cur_id=page_id' );
}
}
+
+   return parent::runMainQueryHook( $tables, $fields, $conds, 
$query_options, $join_conds, $opts );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf7744131c0ab2b954fd29b291f14d67e4cabaf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleChanges
Gerrit-Branch: REL1_29
Gerrit-Owner: Reception123 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: tosfos 

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

[MediaWiki-commits] [Gerrit] mediawiki...SimpleChanges[REL1_29]: Fix for bug in $wgSimpleChangesOnlyLatest handling with Medi...

2017-08-21 Thread Reception123 (Code Review) 
Reception123 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372813 )

Change subject: Fix for bug in $wgSimpleChangesOnlyLatest handling with 
MediaWiki 1.29
..

Fix for bug in $wgSimpleChangesOnlyLatest handling with MediaWiki 1.29

* See bug report here: https://www.mediawiki.org/wiki/Topic:Tv1tm9gz02bn1we9
* Fix is simply inserting our code later in the query building

Change-Id: I601531325359189a6b96b76bc9376bc4af49abf5
(cherry picked from commit 1528e85dc708577fa79334f1a9cf592612097ee7)

Causing issues on 1.29, should be therefore backported.

Change-Id: Idf7744131c0ab2b954fd29b291f14d67e4cabaf5
---
M SpecialSimpleChanges.php
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SimpleChanges 
refs/changes/13/372813/1

diff --git a/SpecialSimpleChanges.php b/SpecialSimpleChanges.php
index 0c41802..3ba26bb 100644
--- a/SpecialSimpleChanges.php
+++ b/SpecialSimpleChanges.php
@@ -14,12 +14,11 @@
 *
 * @inheritdoc
 */
-   protected function buildQuery( &$tables, &$fields, &$conds,
-   &$query_options, &$join_conds, FormOptions $opts ) {
+   protected function runMainQueryHook( &$tables, &$fields, &$conds, 
&$query_options, &$join_conds,
+   $opts
+   ) {
 
global $wgContentNamespaces, 
$wgSimpleChangesOnlyContentNamespaces, $wgSimpleChangesOnlyLatest;
-
-   parent::buildQuery( $tables, $fields, $conds, $query_options, 
$join_conds, $opts );
 
# don't count log entries toward limit of number of changes 
displayed
$conds[] = 'rc_type != ' . RC_LOG;
@@ -45,6 +44,8 @@
$join_conds['page'] = array( 'LEFT JOIN', 
'rc_cur_id=page_id' );
}
}
+
+   return parent::runMainQueryHook( $tables, $fields, $conds, 
$query_options, $join_conds, $opts );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf7744131c0ab2b954fd29b291f14d67e4cabaf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleChanges
Gerrit-Branch: REL1_29
Gerrit-Owner: Reception123 
Gerrit-Reviewer: tosfos 

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