Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/178527
Change subject: Revert "SECURITY: Do not show log action if revdeleted" and fix UI message ...................................................................... Revert "SECURITY: Do not show log action if revdeleted" and fix UI message This mostly reverts commit 89b793b9f72c254f0a6142952a4239fffa8ed945. It also finishes removing of the "fld_action" field in ApiQueryLogEvents that was begun in that commit. Bug: T74222 Change-Id: I185e42d029905fd2781f3ccbbef0687f51234b0d --- M includes/api/ApiQueryLogEvents.php M languages/i18n/en.json 2 files changed, 7 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/27/178527/1 diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 5f9fae4..7d79680 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -36,7 +36,7 @@ } 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; @@ -50,7 +50,6 @@ $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'] ); @@ -200,8 +199,7 @@ } // 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; @@ -212,7 +210,7 @@ $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 ) { @@ -373,18 +371,12 @@ $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 ); } @@ -408,6 +400,7 @@ if ( $this->fld_type ) { $vals['type'] = $row->log_type; + $vals['action'] = $row->log_action; } if ( $this->fld_user || $this->fld_userid ) { diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 52e3a78..e2571c0 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -758,7 +758,7 @@ "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].", @@ -792,7 +792,7 @@ "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", -- To view, visit https://gerrit.wikimedia.org/r/178527 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I185e42d029905fd2781f3ccbbef0687f51234b0d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie <bjor...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits