(bug 43096) Fix querying suppression logs
Change-Id: Ia9709ed5f694e07b7544887b49c99db5ed7063df
This commit is contained in:
parent
19a2991159
commit
c326de4581
1 changed files with 4 additions and 2 deletions
|
|
@ -58,7 +58,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
|
|||
$this->fld_details = isset( $prop['details'] );
|
||||
$this->fld_tags = isset( $prop['tags'] );
|
||||
|
||||
$hideLogs = LogEventsList::getExcludeClause( $db );
|
||||
$hideLogs = LogEventsList::getExcludeClause( $db, 'user' );
|
||||
if ( $hideLogs !== false ) {
|
||||
$this->addWhere( $hideLogs );
|
||||
}
|
||||
|
|
@ -367,8 +367,10 @@ 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';
|
||||
} else {
|
||||
} elseif ( LogEventsList::getExcludeClause( $this->getDB(), 'user' ) === LogEventsList::getExcludeClause( $this->getDB(), 'public' ) ) { // Output can only contain public data.
|
||||
return 'public';
|
||||
} else {
|
||||
return 'anon-public-user-private';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue