| Index: branches/wmf/1.19wmf1/includes/logging/LogFormatter.php |
| — | — | @@ -171,6 +171,7 @@ |
| 172 | 172 | */ |
| 173 | 173 | public function getIRCActionText() { |
| 174 | 174 | $this->plaintext = true; |
| | 175 | + $this->irctext = true; |
| 175 | 176 | $text = $this->getActionText(); |
| 176 | 177 | |
| 177 | 178 | $entry = $this->entry; |
| — | — | @@ -250,6 +251,7 @@ |
| 251 | 252 | break; |
| 252 | 253 | } |
| 253 | 254 | break; |
| | 255 | + |
| 254 | 256 | |
| 255 | 257 | // case 'suppress' --private log -- aaron (sign your messages so we know who to blame in a few years :-D) |
| 256 | 258 | // default: |
| — | — | @@ -259,6 +261,7 @@ |
| 260 | 262 | } |
| 261 | 263 | |
| 262 | 264 | $this->plaintext = false; |
| | 265 | + $this->irctext = false; |
| 263 | 266 | return $text; |
| 264 | 267 | } |
| 265 | 268 | |
| — | — | @@ -521,7 +524,11 @@ |
| 522 | 525 | ); |
| 523 | 526 | |
| 524 | 527 | $performer = $this->getPerformerElement(); |
| 525 | | - return $performer . $this->msg( 'word-separator' )->text() . $action; |
| | 528 | + if ( !$this->irctext ) { |
| | 529 | + $action = $performer . $this->msg( 'word-separator' )->text() . $action; |
| | 530 | + } |
| | 531 | + |
| | 532 | + return $action; |
| 526 | 533 | } |
| 527 | 534 | |
| 528 | 535 | } |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 529 | 536 | Merged /trunk/phase3/includes:r112132-112133 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 530 | 537 | Merged /trunk/phase3:r112132-112133 |