https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112136
Revision: 112136
Author: aaron
Date: 2012-02-22 19:12:18 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
MFT r112132, r112133
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/logging/LogFormatter.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133
Modified: branches/wmf/1.19wmf1/includes/logging/LogFormatter.php
===================================================================
--- branches/wmf/1.19wmf1/includes/logging/LogFormatter.php 2012-02-22
19:07:58 UTC (rev 112135)
+++ branches/wmf/1.19wmf1/includes/logging/LogFormatter.php 2012-02-22
19:12:18 UTC (rev 112136)
@@ -171,6 +171,7 @@
*/
public function getIRCActionText() {
$this->plaintext = true;
+ $this->irctext = true;
$text = $this->getActionText();
$entry = $this->entry;
@@ -250,6 +251,7 @@
break;
}
break;
+
// case 'suppress' --private log -- aaron (sign your
messages so we know who to blame in a few years :-D)
// default:
@@ -259,6 +261,7 @@
}
$this->plaintext = false;
+ $this->irctext = false;
return $text;
}
@@ -521,7 +524,11 @@
);
$performer = $this->getPerformerElement();
- return $performer . $this->msg( 'word-separator' )->text() .
$action;
+ if ( !$this->irctext ) {
+ $action = $performer . $this->msg( 'word-separator'
)->text() . $action;
+ }
+
+ return $action;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
