jenkins-bot has submitted this change and it was merged.
Change subject: Update formatting for log related classes
......................................................................
Update formatting for log related classes
Change-Id: I6535467ed9b22d61b7c5caf3f18067a988871751
---
M includes/logging/DeleteLogFormatter.php
M includes/logging/LogEntry.php
M includes/logging/LogEventsList.php
M includes/logging/LogFormatter.php
M includes/logging/LogPage.php
M includes/logging/LogPager.php
M includes/logging/MoveLogFormatter.php
M includes/logging/NewUsersLogFormatter.php
M includes/logging/PatrolLog.php
M includes/logging/PatrolLogFormatter.php
M includes/logging/RightsLogFormatter.php
11 files changed, 162 insertions(+), 116 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/logging/DeleteLogFormatter.php
b/includes/logging/DeleteLogFormatter.php
index 01528b7..4611192 100644
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -36,6 +36,7 @@
return "$key-legacy";
}
}
+
return $key;
}
@@ -74,6 +75,7 @@
$newParams[3] = $changeText;
$count = count( explode( ',',
$params[$paramStart] ) );
$newParams[4] =
$this->context->getLanguage()->formatNum( $count );
+
return $this->parsedParametersDeleteLog =
$newParams;
} else {
return $this->parsedParametersDeleteLog =
array_slice( $params, 0, 3 );
@@ -87,6 +89,7 @@
// Input is like ofield=2134 or just the number
if ( strpos( $string, 'field=' ) === 1 ) {
list( , $field ) = explode( '=', $string );
+
return (int)$field;
} else {
return (int)$string;
@@ -100,97 +103,99 @@
}
switch ( $this->entry->getSubtype() ) {
- case 'delete': // Show undelete link
- if ( $user->isAllowed( 'undelete' ) ) {
- $message = 'undeletelink';
- } else {
- $message = 'undeleteviewlink';
- }
- $revert = Linker::linkKnown(
- SpecialPage::getTitleFor( 'Undelete' ),
- $this->msg( $message )->escaped(),
- array(),
- array( 'target' =>
$this->entry->getTarget()->getPrefixedDBkey() )
- );
- return $this->msg( 'parentheses' )->rawParams( $revert
)->escaped();
-
- case 'revision': // If an edit was hidden from a page give a
review link to the history
- $params = $this->extractParameters();
- if ( !isset( $params[3] ) || !isset( $params[4] ) ) {
- return '';
- }
-
- // Different revision types use different URL params...
- $key = $params[3];
- // This is a CSV of the IDs
- $ids = explode( ',', $params[4] );
-
- $links = array();
-
- // If there's only one item, we can show a diff link
- if ( count( $ids ) == 1 ) {
- // Live revision diffs...
- if ( $key == 'oldid' || $key == 'revision' ) {
- $links[] = Linker::linkKnown(
- $this->entry->getTarget(),
- $this->msg( 'diff' )->escaped(),
- array(),
- array(
- 'diff' => intval(
$ids[0] ),
- 'unhide' => 1
- )
- );
- // Deleted revision diffs...
- } elseif ( $key == 'artimestamp' || $key ==
'archive' ) {
- $links[] = Linker::linkKnown(
- SpecialPage::getTitleFor(
'Undelete' ),
- $this->msg( 'diff' )->escaped(),
- array(),
- array(
- 'target' =>
$this->entry->getTarget()->getPrefixedDBkey(),
- 'diff' => 'prev',
- 'timestamp' => $ids[0]
- )
- );
+ case 'delete': // Show undelete link
+ if ( $user->isAllowed( 'undelete' ) ) {
+ $message = 'undeletelink';
+ } else {
+ $message = 'undeleteviewlink';
}
- }
+ $revert = Linker::linkKnown(
+ SpecialPage::getTitleFor( 'Undelete' ),
+ $this->msg( $message )->escaped(),
+ array(),
+ array( 'target' =>
$this->entry->getTarget()->getPrefixedDBkey() )
+ );
- // View/modify link...
- $links[] = Linker::linkKnown(
- SpecialPage::getTitleFor( 'Revisiondelete' ),
- $this->msg( 'revdel-restore' )->escaped(),
- array(),
- array(
- 'target' =>
$this->entry->getTarget()->getPrefixedText(),
- 'type' => $key,
- 'ids' => implode( ',', $ids ),
- )
- );
+ return $this->msg( 'parentheses' )->rawParams(
$revert )->escaped();
- return $this->msg( 'parentheses' )->rawParams(
- $this->context->getLanguage()->pipeList( $links
) )->escaped();
+ case 'revision': // If an edit was hidden from a page
give a review link to the history
+ $params = $this->extractParameters();
+ if ( !isset( $params[3] ) || !isset( $params[4]
) ) {
+ return '';
+ }
- case 'event': // Hidden log items, give review link
- $params = $this->extractParameters();
- if ( !isset( $params[3] ) ) {
+ // Different revision types use different URL
params...
+ $key = $params[3];
+ // This is a CSV of the IDs
+ $ids = explode( ',', $params[4] );
+
+ $links = array();
+
+ // If there's only one item, we can show a diff
link
+ if ( count( $ids ) == 1 ) {
+ // Live revision diffs...
+ if ( $key == 'oldid' || $key ==
'revision' ) {
+ $links[] = Linker::linkKnown(
+
$this->entry->getTarget(),
+ $this->msg( 'diff'
)->escaped(),
+ array(),
+ array(
+ 'diff' =>
intval( $ids[0] ),
+ 'unhide' => 1
+ )
+ );
+ // Deleted revision diffs...
+ } elseif ( $key == 'artimestamp' ||
$key == 'archive' ) {
+ $links[] = Linker::linkKnown(
+
SpecialPage::getTitleFor( 'Undelete' ),
+ $this->msg( 'diff'
)->escaped(),
+ array(),
+ array(
+ 'target' =>
$this->entry->getTarget()->getPrefixedDBkey(),
+ 'diff' =>
'prev',
+ 'timestamp' =>
$ids[0]
+ )
+ );
+ }
+ }
+
+ // View/modify link...
+ $links[] = Linker::linkKnown(
+ SpecialPage::getTitleFor(
'Revisiondelete' ),
+ $this->msg( 'revdel-restore'
)->escaped(),
+ array(),
+ array(
+ 'target' =>
$this->entry->getTarget()->getPrefixedText(),
+ 'type' => $key,
+ 'ids' => implode( ',', $ids ),
+ )
+ );
+
+ return $this->msg( 'parentheses' )->rawParams(
+
$this->context->getLanguage()->pipeList( $links ) )->escaped();
+
+ case 'event': // Hidden log items, give review link
+ $params = $this->extractParameters();
+ if ( !isset( $params[3] ) ) {
+ return '';
+ }
+ // This is a CSV of the IDs
+ $query = $params[3];
+ // Link to each hidden object ID, $params[1] is
the url param
+ $revert = Linker::linkKnown(
+ SpecialPage::getTitleFor(
'Revisiondelete' ),
+ $this->msg( 'revdel-restore'
)->escaped(),
+ array(),
+ array(
+ 'target' =>
$this->entry->getTarget()->getPrefixedText(),
+ 'type' => 'logging',
+ 'ids' => $query
+ )
+ );
+
+ return $this->msg( 'parentheses' )->rawParams(
$revert )->escaped();
+ default:
return '';
- }
- // This is a CSV of the IDs
- $query = $params[3];
- // Link to each hidden object ID, $params[1] is the url
param
- $revert = Linker::linkKnown(
- SpecialPage::getTitleFor( 'Revisiondelete' ),
- $this->msg( 'revdel-restore' )->escaped(),
- array(),
- array(
- 'target' =>
$this->entry->getTarget()->getPrefixedText(),
- 'type' => 'logging',
- 'ids' => $query
- )
- );
- return $this->msg( 'parentheses' )->rawParams( $revert
)->escaped();
- default:
- return '';
}
}
}
diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index a1cb3a7..e15943f 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -33,7 +33,6 @@
* @since 1.19
*/
interface LogEntry {
-
/**
* The main log type.
* @return string
@@ -117,7 +116,6 @@
public function isLegacy() {
return false;
}
-
}
/**
@@ -202,6 +200,7 @@
public function isLegacy() {
// This does the check
$this->getParameters();
+
return $this->legacy;
}
@@ -229,6 +228,7 @@
$this->legacy = true;
}
}
+
return $this->params;
}
@@ -246,6 +246,7 @@
$this->performer = User::newFromName(
$userText, false );
}
}
+
return $this->performer;
}
@@ -253,6 +254,7 @@
$namespace = $this->row->log_namespace;
$page = $this->row->log_title;
$title = Title::makeTitle( $namespace, $page );
+
return $title;
}
@@ -267,7 +269,6 @@
public function getDeleted() {
return $this->row->log_deleted;
}
-
}
class RCDatabaseLogEntry extends DatabaseLogEntry {
@@ -301,6 +302,7 @@
$this->performer = User::newFromName(
$userText, false );
}
}
+
return $this->performer;
}
@@ -308,6 +310,7 @@
$namespace = $this->row->rc_namespace;
$page = $this->row->rc_title;
$title = Title::makeTitle( $namespace, $page );
+
return $title;
}
@@ -322,7 +325,6 @@
public function getDeleted() {
return $this->row->rc_deleted;
}
-
}
/**
@@ -448,7 +450,7 @@
public function insert( IDatabase $dbw = null ) {
global $wgContLang;
- $dbw = $dbw ?: wfGetDB( DB_MASTER );
+ $dbw = $dbw ? : wfGetDB( DB_MASTER );
$id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
if ( $this->timestamp === null ) {
@@ -484,8 +486,8 @@
}
foreach ( $values as $value ) {
$rows[] = array(
- 'ls_field' => $tag,
- 'ls_value' => $value,
+ 'ls_field' => $tag,
+ 'ls_value' => $value,
'ls_log_id' => $this->id
);
}
@@ -520,6 +522,7 @@
$ip = $user->getName();
}
}
+
return RecentChange::newLogEntry(
$this->getTimestamp(),
$logpage,
@@ -534,7 +537,6 @@
$newId,
$formatter->getIRCActionComment() // Used for IRC feeds
);
-
}
/**
@@ -589,6 +591,7 @@
public function getTimestamp() {
$ts = $this->timestamp !== null ? $this->timestamp :
wfTimestampNow();
+
return wfTimestamp( TS_MW, $ts );
}
@@ -599,5 +602,4 @@
public function getDeleted() {
return (int)$this->deleted;
}
-
}
diff --git a/includes/logging/LogEventsList.php
b/includes/logging/LogEventsList.php
index c27b57a..fc10a96 100644
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@ -176,6 +176,7 @@
$links[$type] = $this->msg( "log-show-hide-{$type}"
)->rawParams( $link )->escaped();
$hiddens .= Html::hidden( "hide_{$type}_log", $val ) .
"\n";
}
+
// Build links
return '<small>' . $this->getLanguage()->pipeList( $links ) .
'</small>' . $hiddens;
}
@@ -191,6 +192,7 @@
unset( $this->mDefaultQuery['month'] );
unset( $this->mDefaultQuery['year'] );
}
+
return $this->mDefaultQuery;
}
@@ -202,6 +204,7 @@
$queryType = count( $queryTypes ) == 1 ? $queryTypes[0] : '';
$selector = $this->getTypeSelector();
$selector->setDefault( $queryType );
+
return $selector->getHtml();
}
@@ -281,6 +284,7 @@
return Xml::inputLabel( $this->msg(
'revdelete-offender' )->text(), 'offender',
'mw-log-offender', 20, $offender );
}
+
return '';
}
@@ -343,8 +347,11 @@
* @return string
*/
private function getShowHideLinks( $row ) {
- if ( ( $this->flags == self::NO_ACTION_LINK ) // we don't want
to see the links
- || $row->log_type == 'suppress' ) { // no one can hide
items from the suppress log
+ // We don't want to see the links and
+ // no one can hide items from the suppress log.
+ if ( ( $this->flags == self::NO_ACTION_LINK )
+ || $row->log_type == 'suppress'
+ ) {
return '';
}
$del = '';
@@ -373,6 +380,7 @@
}
}
}
+
return $del;
}
@@ -394,6 +402,7 @@
$match = $wgUser->isAllowed( $right );
}
}
+
return $match;
}
@@ -431,6 +440,7 @@
global $wgUser;
$user = $wgUser;
}
+
return $user->isAllowed( $permission );
} else {
return true;
@@ -613,6 +623,7 @@
} elseif ( $hiddenLogs ) {
return 'log_type NOT IN (' . $db->makeList( $hiddenLogs
) . ')';
}
+
return false;
}
}
diff --git a/includes/logging/LogFormatter.php
b/includes/logging/LogFormatter.php
index 8f60aee..6e31242 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -154,6 +154,7 @@
$this->plaintext = true;
$text = $this->getActionText();
$this->plaintext = false;
+
return $text;
}
@@ -226,7 +227,7 @@
break;
//case 'revision': // Revision deletion
//case 'event': // Log deletion
- // see
https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/LogPage.php?&pathrev=97044&r1=97043&r2=97044
+ // see
https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/LogPage.php?&pathrev=97044&r1=97043&r2=97044
//default:
}
break;
@@ -247,18 +248,18 @@
case 'protect':
switch ( $entry->getSubtype() ) {
- case 'protect':
- $text = wfMessage( 'protectedarticle' )
- ->rawParams( $target . ' ' .
$parameters[0] )->inContentLanguage()->escaped();
- break;
- case 'unprotect':
- $text = wfMessage( 'unprotectedarticle'
)
- ->rawParams( $target
)->inContentLanguage()->escaped();
- break;
- case 'modify':
- $text = wfMessage(
'modifiedarticleprotection' )
- ->rawParams( $target . ' ' .
$parameters[0] )->inContentLanguage()->escaped();
- break;
+ case 'protect':
+ $text = wfMessage(
'protectedarticle' )
+ ->rawParams( $target .
' ' . $parameters[0] )->inContentLanguage()->escaped();
+ break;
+ case 'unprotect':
+ $text = wfMessage(
'unprotectedarticle' )
+ ->rawParams( $target
)->inContentLanguage()->escaped();
+ break;
+ case 'modify':
+ $text = wfMessage(
'modifiedarticleprotection' )
+ ->rawParams( $target .
' ' . $parameters[0] )->inContentLanguage()->escaped();
+ break;
}
break;
@@ -316,7 +317,6 @@
break;
}
break;
-
// case 'suppress' --private log -- aaron (sign your
messages so we know who to blame in a few years :-D)
// default:
}
@@ -326,6 +326,7 @@
$this->plaintext = false;
$this->irctext = false;
+
return $text;
}
@@ -359,6 +360,7 @@
protected function getActionMessage() {
$message = $this->msg( $this->getMessageKey() );
$message->params( $this->getMessageParameters() );
+
return $message;
}
@@ -421,6 +423,7 @@
}
}
}
+
return $params;
}
@@ -446,6 +449,7 @@
// Bad things happens if the numbers are not in correct order
ksort( $params );
+
return $this->parsedParameters = $params;
}
@@ -538,6 +542,7 @@
}
$link = '[[' . $title->getPrefixedText() . ']]';
}
+
return $link;
}
@@ -592,6 +597,7 @@
$content = $this->msg( $message )->escaped();
$attribs = array( 'class' => 'history-deleted' );
+
return Html::rawElement( 'span', $attribs, $content );
}
@@ -605,6 +611,7 @@
return $content;
}
$attribs = array( 'class' => 'history-deleted' );
+
return Html::rawElement( 'span', $attribs, $content );
}
@@ -635,6 +642,7 @@
);
}
}
+
return $element;
}
@@ -654,7 +662,6 @@
// problems with extensions
return $this->getMessageParameters();
}
-
}
/**
@@ -750,6 +757,7 @@
$this->msg( 'change-blocklink'
)->escaped()
)
);
+
return $this->msg( 'parentheses' )->rawParams(
$this->context->getLanguage()->pipeList( $links
) )->escaped();
// Show change protection link
@@ -772,6 +780,7 @@
array( 'action' => 'protect' )
);
}
+
return $this->msg( 'parentheses' )->rawParams(
$this->context->getLanguage()->pipeList( $links
) )->escaped();
// Show unmerge link
@@ -791,6 +800,7 @@
'mergepoint' => $params[4]
)
);
+
return $this->msg( 'parentheses' )->rawParams( $revert
)->escaped();
}
@@ -813,4 +823,3 @@
return $this->revert;
}
}
-
diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index d706cd7..35fb7cc 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -118,6 +118,7 @@
);
$rc->notifyRC2UDP();
}
+
return $newId;
}
@@ -175,6 +176,7 @@
*/
public static function validTypes() {
global $wgLogTypes;
+
return $wgLogTypes;
}
@@ -216,6 +218,7 @@
*/
public static function logHeader( $type ) {
global $wgLogHeaders;
+
return wfMessage( $wgLogHeaders[$type] )->parse();
}
@@ -532,6 +535,7 @@
for ( $i = 0; $i < count( $flags ); $i++ ) {
$flags[$i] = self::formatBlockFlag( $flags[$i], $lang );
}
+
return wfMessage( 'parentheses' )->inLanguage( $lang )
->rawParams( $lang->commaList( $flags ) )->escaped();
}
@@ -598,6 +602,7 @@
} else {
$key = 'log-description-' . $this->type;
}
+
return wfMessage( $key );
}
@@ -614,6 +619,7 @@
// '' always returns true with $user->isAllowed()
$restriction = '';
}
+
return $restriction;
}
@@ -624,7 +630,7 @@
*/
public function isRestricted() {
$restriction = $this->getRestriction();
+
return $restriction !== '' && $restriction !== '*';
}
-
}
diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index 9ce197e..1c613e8 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -67,6 +67,7 @@
$query['user'] = $this->performer;
$query['month'] = $this->mMonth;
$query['year'] = $this->mYear;
+
return $query;
}
@@ -87,6 +88,7 @@
}
}
}
+
return $filters;
}
@@ -269,6 +271,7 @@
# Add ChangeTags filter query
ChangeTags::modifyDisplayQuery( $info['tables'],
$info['fields'], $info['conds'],
$info['join_conds'], $info['options'],
$this->mTagFilter );
+
return $info;
}
@@ -306,6 +309,7 @@
$this->mResult->seek( 0 );
}
wfProfileOut( __METHOD__ );
+
return '';
}
diff --git a/includes/logging/MoveLogFormatter.php
b/includes/logging/MoveLogFormatter.php
index c471b69..3913016 100644
--- a/includes/logging/MoveLogFormatter.php
+++ b/includes/logging/MoveLogFormatter.php
@@ -31,6 +31,7 @@
class MoveLogFormatter extends LogFormatter {
public function getPreloadTitles() {
$params = $this->extractParameters();
+
return array( Title::newFromText( $params[3] ) );
}
@@ -40,6 +41,7 @@
if ( isset( $params[4] ) && $params[4] === '1' ) {
$key .= '-noredirect';
}
+
return $key;
}
@@ -49,6 +51,7 @@
$newname = $this->makePageLink( Title::newFromText( $params[3]
) );
$params[2] = Message::rawParam( $oldname );
$params[3] = Message::rawParam( $newname );
+
return $params;
}
@@ -77,6 +80,7 @@
'wpMovetalk' => 0
)
);
+
return $this->msg( 'parentheses' )->rawParams( $revert
)->escaped();
}
}
diff --git a/includes/logging/NewUsersLogFormatter.php
b/includes/logging/NewUsersLogFormatter.php
index 602728b..c870d51 100644
--- a/includes/logging/NewUsersLogFormatter.php
+++ b/includes/logging/NewUsersLogFormatter.php
@@ -41,6 +41,7 @@
$params[2] = Message::rawParam( $this->makeUserLink(
$target ) );
$params[3] = $target->getName();
}
+
return $params;
}
@@ -51,6 +52,7 @@
# not needed and can contain incorrect links
return '';
}
+
return parent::getComment();
}
@@ -60,6 +62,7 @@
//add the user talk to LinkBatch for the userLink
return array( Title::makeTitle( NS_USER_TALK,
$this->entry->getTarget()->getText() ) );
}
+
return array();
}
}
diff --git a/includes/logging/PatrolLog.php b/includes/logging/PatrolLog.php
index bb76d5a..40be52c 100644
--- a/includes/logging/PatrolLog.php
+++ b/includes/logging/PatrolLog.php
@@ -27,7 +27,6 @@
* logs of patrol events
*/
class PatrolLog {
-
/**
* Record a log event for a change being patrolled
*
@@ -65,6 +64,7 @@
if ( !$auto ) {
$entry->publish( $logid, 'udp' );
}
+
return true;
}
@@ -82,5 +82,4 @@
'6::auto' => (int)$auto
);
}
-
}
diff --git a/includes/logging/PatrolLogFormatter.php
b/includes/logging/PatrolLogFormatter.php
index 507039b..2abaf17 100644
--- a/includes/logging/PatrolLogFormatter.php
+++ b/includes/logging/PatrolLogFormatter.php
@@ -35,6 +35,7 @@
if ( isset( $params[5] ) && $params[5] ) {
$key .= '-auto';
}
+
return $key;
}
@@ -58,6 +59,7 @@
}
$params[3] = Message::rawParam( $revlink );
+
return $params;
}
}
diff --git a/includes/logging/RightsLogFormatter.php
b/includes/logging/RightsLogFormatter.php
index d3daf6e..ac252ae 100644
--- a/includes/logging/RightsLogFormatter.php
+++ b/includes/logging/RightsLogFormatter.php
@@ -55,6 +55,7 @@
if ( !isset( $params[3] ) && !isset( $params[4] ) ) {
$key .= '-legacy';
}
+
return $key;
}
--
To view, visit https://gerrit.wikimedia.org/r/98815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6535467ed9b22d61b7c5caf3f18067a988871751
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
