| Index: trunk/phase3/includes/logging/LogEntry.php |
| — | — | @@ -470,7 +470,7 @@ |
| 471 | 471 | $this->getComment(), |
| 472 | 472 | serialize( (array) $this->getParameters() ), |
| 473 | 473 | $newId, |
| 474 | | - $formatter->getIRCActionText() // Used for IRC feeds |
| | 474 | + $formatter->getIRCActionComment() // Used for IRC feeds |
| 475 | 475 | ); |
| 476 | 476 | |
| 477 | 477 | if ( $to === 'rc' || $to === 'rcandudp' ) { |
| Index: trunk/phase3/includes/logging/LogFormatter.php |
| — | — | @@ -148,7 +148,28 @@ |
| 149 | 149 | * @see getActionText() |
| 150 | 150 | * @return string text |
| 151 | 151 | */ |
| 152 | | - public function getIRCActionText() { |
| | 152 | + public function getIRCActionComment() { |
| | 153 | + $actionComment = $this->getIRCActionText(); |
| | 154 | + $comment = $this->entry->getComment(); |
| | 155 | + |
| | 156 | + if ( $comment != '' ) { |
| | 157 | + if ( $actionComment == '' ) { |
| | 158 | + $actionComment = $comment; |
| | 159 | + } else { |
| | 160 | + $actionComment .= wfMsgForContent( 'colon-separator' ) . $comment; |
| | 161 | + } |
| | 162 | + } |
| | 163 | + |
| | 164 | + return $actionComment; |
| | 165 | + } |
| | 166 | + |
| | 167 | + /** |
| | 168 | + * Even uglier hack to maintain backwards compatibilty with IRC bots |
| | 169 | + * (bug 34508). |
| | 170 | + * @see getActionText() |
| | 171 | + * @return string text |
| | 172 | + */ |
| | 173 | + protected function getIRCActionText() { |
| 153 | 174 | $this->plaintext = true; |
| 154 | 175 | $text = $this->getActionText(); |
| 155 | 176 | |