* link-title Title object to link to
* link-target Value for the target attribute, only with link-url
* no-link Boolean, suppress description link
+ * targetlang (optional) Target language code, see Parser::getTargetLanguage()
*
* @param array $handlerParams Associative array of media handler parameters, to be passed
* to transform(). Typical keys are "width" and "page".
* @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to.
* For use with external changes.
*
- * @return mixed|string
+ * @return string HTML
*/
public static function formatComment(
$comment, $title = null, $local = false, $wikiId = null
$title->getDBkey(), $section );
}
if ( $sectionTitle ) {
- $link = Linker::makeCommentLink( $sectionTitle, $wgLang->getArrow(), $wikiId, 'noclasses' );
+ $link = Linker::makeCommentLink(
+ $sectionTitle, $wgLang->getArrow() . $auto, $wikiId, 'noclasses'
+ );
+ $auto = '';
} else {
$link = '';
}
# autocomment $postsep written summary (/* section */ summary)
$auto .= wfMessage( 'colon-separator' )->inContentLanguage()->escaped();
}
- $auto = '<span class="autocomment">' . $auto . '</span>';
- $comment = $pre . $link . $wgLang->getDirMark()
- . '<span dir="auto">' . $auto;
- $append .= '</span>';
+ if ( $auto ) {
+ $auto = '<span dir="auto"><span class="autocomment">' . $auto . '</span>';
+ $append .= '</span>';
+ }
+ $comment = $pre . $link . $wgLang->getDirMark() . $auto;
}
return $comment;
},
* @return string
*/
public static function commentBlock(
- $comment, $title = null, $local = false, $wikiId = null
+ $comment, $title = null, $local = false, $wikiId = null, $useParentheses = true
) {
// '*' used to be the comment inserted by the software way back
// in antiquity in case none was provided, here for backwards
return '';
} else {
$formatted = self::formatComment( $comment, $title, $local, $wikiId );
- $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
- return " <span class=\"comment\">$formatted</span>";
+ if ( $useParentheses ) {
+ $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
+ $classNames = 'comment';
+ } else {
+ $classNames = 'comment comment--without-parentheses';
+ }
+ return " <span class=\"$classNames\">$formatted</span>";
}
}
* @param Revision $rev
* @param bool $local Whether section links should refer to local page
* @param bool $isPublic Show only if all users can see it
+ * @param bool $useParentheses (optional) Wrap comments in parentheses where needed
* @return string HTML fragment
*/
- public static function revComment( Revision $rev, $local = false, $isPublic = false ) {
+ public static function revComment( Revision $rev, $local = false, $isPublic = false,
+ $useParentheses = true
+ ) {
if ( $rev->getComment( Revision::RAW ) == "" ) {
return "";
}
$block = " <span class=\"comment\">" . wfMessage( 'rev-deleted-comment' )->escaped() . "</span>";
} elseif ( $rev->userCan( Revision::DELETED_COMMENT ) ) {
$block = self::commentBlock( $rev->getComment( Revision::FOR_THIS_USER ),
- $rev->getTitle(), $local );
+ $rev->getTitle(), $local, null, $useParentheses );
} else {
$block = " <span class=\"comment\">" . wfMessage( 'rev-deleted-comment' )->escaped() . "</span>";
}