| Index: trunk/extensions/Configure/SpecialViewConfig.php |
| — | — | @@ -175,19 +175,26 @@ |
| 176 | 176 | $hasSelf = in_array( $this->mWiki, $wikis ); |
| 177 | 177 | |
| 178 | 178 | extract( $this->formatConf ); |
| 179 | | - $time = $wgLang->timeAndDate( $ts ); |
| | 179 | + $datim = $wgLang->timeAndDate( $ts ); |
| | 180 | + $date = $wgLang->date( $ts ); |
| | 181 | + $time = $wgLang->time( $ts ); |
| 180 | 182 | |
| 181 | 183 | ## Make user link... |
| 182 | 184 | $userLink = ''; |
| | 185 | + $user = ''; |
| 183 | 186 | if (!$arr['user_wiki'] && !$arr['user_name'] ) { |
| 184 | 187 | $userLink = ''; # Nothing... |
| | 188 | + $user = ''; # Nothing... |
| 185 | 189 | } elseif ( $arr['user_wiki'] == wfWikiId() ) { |
| 186 | 190 | $userLink = $skin->link( Title::makeTitle( NS_USER, $arr['user_name'] ), $arr['user_name'] ); |
| | 191 | + $user = $arr['user_name']; |
| 187 | 192 | } elseif ( class_exists( 'WikiMap' ) && ($wiki = WikiMap::getWiki( $arr['user_wiki'] ) ) ) { |
| 188 | 193 | $userLink = $skin->makeExternalLink( $wiki->getUrl( 'User:'.$arr['user_name'] ), $arr['user_name'].'@'.$arr['user_wiki'] ); |
| | 194 | + $user = ''; # Nothing... |
| 189 | 195 | } else { |
| 190 | 196 | ## Last-ditch |
| 191 | 197 | $userLink = $arr['user_name'].'@'.$arr['user_wiki']; |
| | 198 | + $user = ''; # Nothing... |
| 192 | 199 | } |
| 193 | 200 | |
| 194 | 201 | $actions = array(); |
| — | — | @@ -263,7 +270,7 @@ |
| 264 | 271 | $comment = $arr['reason'] ? $skin->commentBlock( $arr['reason'] ) : ''; |
| 265 | 272 | |
| 266 | 273 | $action = $wgLang->commaList( $actions ); |
| 267 | | - return Xml::tags( 'li', null, wfMsgExt( 'configure-viewconfig-line', array( 'parseinline', 'replaceafter' ), array( $buttons, $time, $userLink, $action, $comment ) ) )."\n"; |
| | 274 | + return Xml::tags( 'li', null, wfMsgExt( 'configure-viewconfig-line', array( 'parseinline', 'replaceafter' ), array( $buttons, $datim, $userLink, $action, $comment, $date, $time, $user ) ) )."\n"; |
| 268 | 275 | } |
| 269 | 276 | |
| 270 | 277 | /** |
| Index: trunk/extensions/Configure/Configure.i18n.php |
| — | — | @@ -279,11 +279,14 @@ |
| 280 | 280 | 'configure-transwiki-not-in-range' => '* $1 is the wiki, as given by the user |
| 281 | 281 | * $2 is the list of allowed wikis |
| 282 | 282 | * $3 is the number of items in $2', |
| 283 | | - 'configure-viewconfig-line' => '* $1 will be replaced with two radio buttons, as in history pages |
| | 283 | + 'configure-viewconfig-line' => '* $1 may be two radio buttons, as in history pages, or empty |
| 284 | 284 | * $2 is the time and date of the version |
| 285 | | -* $3 is the user who made the version |
| 286 | | -* $4 will be replaced with links to that version |
| 287 | | -* $5 is the comment, as provided by the user', |
| | 285 | +* $3 is a link to the user who made the version, or a text, or empty |
| | 286 | +* $4 will be replaced with zero to several links to that version |
| | 287 | +* $5 is the comment, as provided by the user, which may be empty |
| | 288 | +* $6 is the date of the version |
| | 289 | +* $7 is the time of the version |
| | 290 | +* $8 is the name of the user who made version, or empty', |
| 288 | 291 | 'extensions' => 'Name of special page displayed in [[Special:SpecialPages]].', |
| 289 | 292 | 'right-configure' => '{{doc-right}}', |
| 290 | 293 | 'right-configure-all' => '{{doc-right}}', |