From e506fccbaf5246815ede08163c78bf805d50e130 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Wed, 19 Dec 2012 17:10:13 +0100 Subject: [PATCH] Follow-up I5f7f6da0 (cefb9ef): pass the User parameter to more LogEventsList::getExcludeClause() calls Per comment of Umherirrender, this is needed after the merge of Ia9709ed5 (c326de4). Change-Id: I7e9c2c7ee7de4e8f26008134c54b6f341ed91f7f --- includes/api/ApiQueryLogEvents.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 1b651680f0..7d3907094e 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -58,7 +58,7 @@ class ApiQueryLogEvents extends ApiQueryBase { $this->fld_details = isset( $prop['details'] ); $this->fld_tags = isset( $prop['tags'] ); - $hideLogs = LogEventsList::getExcludeClause( $db, 'user' ); + $hideLogs = LogEventsList::getExcludeClause( $db, 'user', $this->getUser() ); if ( $hideLogs !== false ) { $this->addWhere( $hideLogs ); } @@ -367,7 +367,9 @@ class ApiQueryLogEvents extends ApiQueryBase { if ( !is_null( $params['prop'] ) && in_array( 'parsedcomment', $params['prop'] ) ) { // formatComment() calls wfMessage() among other things return 'anon-public-user-private'; - } elseif ( LogEventsList::getExcludeClause( $this->getDB(), 'user' ) === LogEventsList::getExcludeClause( $this->getDB(), 'public' ) ) { // Output can only contain public data. + } elseif ( LogEventsList::getExcludeClause( $this->getDB(), 'user', $this->getUser() ) + === LogEventsList::getExcludeClause( $this->getDB(), 'public' ) + ) { // Output can only contain public data. return 'public'; } else { return 'anon-public-user-private'; -- 2.20.1