| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -1111,7 +1111,7 @@ |
| 1112 | 1112 | if ( $file->isDeleted( File::DELETED_COMMENT ) ) { |
| 1113 | 1113 | $row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span>'; |
| 1114 | 1114 | } else { |
| 1115 | | - $row .= $this->skin->commentBlock( $description, $this->title, false, false ); |
| | 1115 | + $row .= $this->skin->commentBlock( $description, $this->title ); |
| 1116 | 1116 | } |
| 1117 | 1117 | $row .= '</td>'; |
| 1118 | 1118 | |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1343,10 +1343,10 @@ |
| 1344 | 1344 | * @param $comment String |
| 1345 | 1345 | * @param $title Mixed: Title object (to generate link to section in autocomment) or null |
| 1346 | 1346 | * @param $local Boolean: whether section links should refer to local page |
| 1347 | | - * @param $embraced Boolean: whether the formatted comment should be embraced with () |
| | 1347 | + * |
| 1348 | 1348 | * @return string |
| 1349 | 1349 | */ |
| 1350 | | - static function commentBlock( $comment, $title = null, $local = false, $embraced = true ) { |
| | 1350 | + static function commentBlock( $comment, $title = null, $local = false ) { |
| 1351 | 1351 | // '*' used to be the comment inserted by the software way back |
| 1352 | 1352 | // in antiquity in case none was provided, here for backwards |
| 1353 | 1353 | // compatability, acc. to brion -ævar |
| — | — | @@ -1354,10 +1354,7 @@ |
| 1355 | 1355 | return ''; |
| 1356 | 1356 | } else { |
| 1357 | 1357 | $formatted = self::formatComment( $comment, $title, $local ); |
| 1358 | | - if ( $embraced ) { |
| 1359 | | - $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped(); |
| 1360 | | - } |
| 1361 | | - return Html::rawElement( 'span', array( 'class' => 'comment' ), $formatted ); |
| | 1358 | + return " <span class=\"comment\">($formatted)</span>"; |
| 1362 | 1359 | } |
| 1363 | 1360 | } |
| 1364 | 1361 | |
| — | — | @@ -1377,7 +1374,7 @@ |
| 1378 | 1375 | if ( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) { |
| 1379 | 1376 | $block = " <span class=\"comment\">" . wfMsgHtml( 'rev-deleted-comment' ) . "</span>"; |
| 1380 | 1377 | } else if ( $rev->userCan( Revision::DELETED_COMMENT ) ) { |
| 1381 | | - $block = ' ' . self::commentBlock( $rev->getComment( Revision::FOR_THIS_USER ), |
| | 1378 | + $block = self::commentBlock( $rev->getComment( Revision::FOR_THIS_USER ), |
| 1382 | 1379 | $rev->getTitle(), $local ); |
| 1383 | 1380 | } else { |
| 1384 | 1381 | $block = " <span class=\"comment\">" . wfMsgHtml( 'rev-deleted-comment' ) . "</span>"; |
| Index: trunk/phase3/includes/specials/SpecialListfiles.php |
| — | — | @@ -221,7 +221,7 @@ |
| 222 | 222 | case 'img_size': |
| 223 | 223 | return $this->getSkin()->formatSize( $value ); |
| 224 | 224 | case 'img_description': |
| 225 | | - return $this->getSkin()->commentBlock( $value, null, false, false ); |
| | 225 | + return $this->getSkin()->commentBlock( $value ); |
| 226 | 226 | case 'count': |
| 227 | 227 | return intval( $value ) + 1; |
| 228 | 228 | } |