Anja Jentzsch has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54847
Change subject: Use the watchlist options given by the hook
......................................................................
Use the watchlist options given by the hook
instead of extracting them from wgRequest and wgUser
(Requires I688ab0b35b301f180bbfde3ad3043b1ee602de10)
Change-Id: I2e27df0528f1ca94043bb8cb6229894839da235e
---
M client/WikibaseClient.hooks.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/47/54847/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 845a7e2..c24c84a 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -476,10 +476,11 @@
* @param array &$tables
* @param array &$join_conds
* @param array &$fields
+ * @param array $values
*
* @return bool
*/
- public static function onSpecialWatchlistQuery( array &$conds, array
&$tables, array &$join_conds, array &$fields ) {
+ public static function onSpecialWatchlistQuery( array &$conds, array
&$tables, array &$join_conds, array &$fields, array $values ) {
global $wgRequest, $wgUser;
wfProfileIn( __METHOD__ );
@@ -488,7 +489,7 @@
// Don't act on activated enhanced watchlist
$wgRequest->getBool( 'enhanced', $wgUser->getOption(
'usenewrc' ) ) === false &&
// Or in case the user disabled it
- $wgRequest->getBool( 'hideWikibase',
!$wgUser->getOption( 'wlshowwikibase' ) ) === false
+ $values['hideWikibase'] === 0
) {
$dbr = wfGetDB( DB_SLAVE );
--
To view, visit https://gerrit.wikimedia.org/r/54847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e27df0528f1ca94043bb8cb6229894839da235e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.21-wmf12
Gerrit-Owner: Anja Jentzsch <anja.jentz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
