Page MenuHomePhabricator

bug34508.2.patch

Authored By
bzimport
Nov 22 2014, 12:11 AM
Size
2 KB
Referenced Files
None
Subscribers
None

bug34508.2.patch

Index: includes/logging/LogFormatter.php
===================================================================
--- includes/logging/LogFormatter.php (revision 111987)
+++ includes/logging/LogFormatter.php (working copy)
@@ -168,7 +168,11 @@
* @return Message|string pre-escaped html
*/
protected function getActionMessage() {
- $message = $this->msg( $this->getMessageKey() );
+ $msgkey = $this->getMessageKey( $this->plaintext );
+ $message = $this->msg( $msgkey );
+ if( !$message->exists() ) {
+ $message = $this->msg( $this->getMessageKey() );
+ }
$message->params( $this->getMessageParameters() );
return $message;
}
@@ -180,10 +184,16 @@
* key depending on the entry itself.
* @return string message key
*/
- protected function getMessageKey() {
+ protected function getMessageKey( $plaintext = false ) {
$type = $this->entry->getType();
$subtype = $this->entry->getSubtype();
- $key = "logentry-$type-$subtype";
+ if( $plaintext ) {
+ $key = "logentry-plain-$type-$subtype";
+ }
+ else {
+ $key = "logentry-$type-$subtype";
+ }
+
return $key;
}
@@ -415,8 +425,8 @@
return array( Title::newFromText( $params[3] ) );
}
- protected function getMessageKey() {
- $key = parent::getMessageKey();
+ protected function getMessageKey( $plaintext = false ) {
+ $key = parent::getMessageKey( $plaintext );
$params = $this->getMessageParameters();
if ( isset( $params[4] ) && $params[4] === '1' ) {
$key .= '-noredirect';
Index: languages/messages/MessagesEn.php
===================================================================
--- languages/messages/MessagesEn.php (revision 111324)
+++ languages/messages/MessagesEn.php (working copy)
@@ -4709,6 +4709,9 @@
'logentry-newusers-autocreate' => 'Account $1 was created automatically',
'newuserlog-byemail' => 'password sent by e-mail',
+# For IRC, see bug 34508. Do not change
+'logentry-plain-move-move_redir' => 'moved $3 to $4 over redirect',
+
# Feedback
'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug].
Otherwise, you can use the easy form below. Your comment will be added to the page "[$3 $2]", along with your username and what browser you are using.',

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
8405
Default Alt Text
bug34508.2.patch (2 KB)

Event Timeline