}
private $fld_ids = false, $fld_title = false, $fld_type = false,
- $fld_action = false, $fld_user = false, $fld_userid = false,
+ $fld_user = false, $fld_userid = false,
$fld_timestamp = false, $fld_comment = false, $fld_parsedcomment = false,
$fld_details = false, $fld_tags = false;
$this->fld_ids = isset( $prop['ids'] );
$this->fld_title = isset( $prop['title'] );
$this->fld_type = isset( $prop['type'] );
- $this->fld_action = isset( $prop['action'] );
$this->fld_user = isset( $prop['user'] );
$this->fld_userid = isset( $prop['userid'] );
$this->fld_timestamp = isset( $prop['timestamp'] );
}
// Paranoia: avoid brute force searches (bug 17342)
- $hideActions = $params['namespace'] !== null || !is_null( $title ) || !is_null( $params['action'] );
- if ( $hideActions || !is_null( $user ) ) {
+ if ( $params['namespace'] !== null || !is_null( $title ) || !is_null( $user ) ) {
if ( !$this->getUser()->isAllowed( 'deletedhistory' ) ) {
$titleBits = LogPage::DELETED_ACTION;
$userBits = LogPage::DELETED_USER;
$titleBits = 0;
$userBits = 0;
}
- if ( $hideActions && $titleBits ) {
+ if ( ( $params['namespace'] !== null || !is_null( $title ) ) && $titleBits ) {
$this->addWhere( $db->bitAnd( 'log_deleted', $titleBits ) . " != $titleBits" );
}
if ( !is_null( $user ) && $userBits ) {
$title = Title::makeTitle( $row->log_namespace, $row->log_title );
}
- if ( $this->fld_title || $this->fld_ids || $this->fld_type
- || $this->fld_details && $row->log_params !== ''
- ) {
+ if ( $this->fld_title || $this->fld_ids || $this->fld_details && $row->log_params !== '' ) {
if ( LogEventsList::isDeleted( $row, LogPage::DELETED_ACTION ) ) {
$vals['actionhidden'] = '';
$anyHidden = true;
}
if ( LogEventsList::userCan( $row, LogPage::DELETED_ACTION, $user ) ) {
-
- if ( $this->fld_type ) {
- $vals['action'] = $row->log_action;
- }
if ( $this->fld_title ) {
ApiQueryBase::addTitleInfo( $vals, $title );
}
if ( $this->fld_type ) {
$vals['type'] = $row->log_type;
+ $vals['action'] = $row->log_action;
}
if ( $this->fld_user || $this->fld_userid ) {
"history-feed-empty": "The requested page does not exist.\nIt may have been deleted from the wiki, or renamed.\nTry [[Special:Search|searching on the wiki]] for relevant new pages.",
"rev-deleted-comment": "(edit summary removed)",
"rev-deleted-user": "(username removed)",
- "rev-deleted-event": "(log action removed)",
+ "rev-deleted-event": "(log details removed)",
"rev-deleted-user-contribs": "[username or IP address removed - edit hidden from contributions]",
"rev-deleted-text-permission": "This page revision has been <strong>deleted</strong>.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].",
"rev-suppressed-text-permission": "This page revision has been <strong>suppressed</strong>.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].",
"revdelete-legend": "Set visibility restrictions",
"revdelete-hide-text": "Revision text",
"revdelete-hide-image": "Hide file content",
- "revdelete-hide-name": "Hide action and target",
+ "revdelete-hide-name": "Hide target and parameters",
"revdelete-hide-comment": "Edit summary",
"revdelete-hide-user": "Editor's username/IP address",
"revdelete-hide-restricted": "Suppress data from administrators as well as others",