| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -973,8 +973,9 @@ |
| 974 | 974 | * add a separator where needed and format the comment itself with CSS |
| 975 | 975 | * Called by Linker::formatComment. |
| 976 | 976 | * |
| 977 | | - * @param $comment Comment text |
| 978 | | - * @param $title An optional title object used to links to sections |
| | 977 | + * @param string $comment Comment text |
| | 978 | + * @param object $title An optional title object used to links to sections |
| | 979 | + * @return string $comment formatted comment |
| 979 | 980 | * |
| 980 | 981 | * @todo Document the $local parameter. |
| 981 | 982 | */ |
| — | — | @@ -1002,14 +1003,17 @@ |
| 1003 | 1004 | $sectionTitle = wfClone( $title ); |
| 1004 | 1005 | $sectionTitle->mFragment = $section; |
| 1005 | 1006 | } |
| 1006 | | - $link = $this->makeKnownLinkObj( $sectionTitle, wfMsg( 'sectionlink' ) ); |
| | 1007 | + $link = $this->makeKnownLinkObj( $sectionTitle, wfMsgForContent( 'sectionlink' ) ); |
| 1007 | 1008 | } |
| 1008 | | - $sep='-'; |
| 1009 | | - $auto=$link.$auto; |
| 1010 | | - if($pre) { $auto = $sep.' '.$auto; } |
| 1011 | | - if($post) { $auto .= ' '.$sep; } |
| 1012 | | - $auto='<span class="autocomment">'.$auto.'</span>'; |
| 1013 | | - $comment=$pre.$auto.$post; |
| | 1009 | + $auto = $link . $auto; |
| | 1010 | + if( $pre ) { |
| | 1011 | + $auto = '- ' . $auto; # written summary $presep autocomment (summary /* section */) |
| | 1012 | + } |
| | 1013 | + if( $post ) { |
| | 1014 | + $auto .= ': '; # autocomment $postsep written summary (/* section */ summary) |
| | 1015 | + } |
| | 1016 | + $auto = '<span class="autocomment">' . $auto . '</span>'; |
| | 1017 | + $comment = $pre . $auto . $post; |
| 1014 | 1018 | } |
| 1015 | 1019 | |
| 1016 | 1020 | return $comment; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -157,6 +157,7 @@ |
| 158 | 158 | and installed when at the superuser level. |
| 159 | 159 | * The default robot policy for the entire wiki is now configurable via the |
| 160 | 160 | $wgDefaultRobotPolicy setting. |
| | 161 | +* (bug 12239) Use different separators for autocomments |
| 161 | 162 | |
| 162 | 163 | === Bug fixes in 1.12 === |
| 163 | 164 | |