| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -595,17 +595,15 @@ |
| 596 | 596 | |
| 597 | 597 | $options = $nondefaults + $defaults; |
| 598 | 598 | |
| 599 | | - if( $options['from'] ) |
| 600 | | - $note = wfMsgExt( 'rcnotefrom', array( 'parseinline' ), |
| | 599 | + $note = ''; |
| | 600 | + if( $options['from'] ) { |
| | 601 | + $note .= wfMsgExt( 'rcnotefrom', array( 'parseinline' ), |
| 601 | 602 | $wgLang->formatNum( $options['limit'] ), |
| 602 | | - $wgLang->timeanddate( $options['from'], true ) ); |
| 603 | | - else |
| 604 | | - $note = wfMsgExt( 'rcnote', array( 'parseinline' ), |
| 605 | | - $wgLang->formatNum( $options['limit'] ), |
| 606 | | - $wgLang->formatNum( $options['days'] ), |
| 607 | | - $wgLang->timeAndDate( wfTimestampNow(), true ), |
| 608 | | - $wgLang->date( wfTimestampNow(), true ), |
| 609 | | - $wgLang->time( wfTimestampNow(), true ) ); |
| | 603 | + $wgLang->timeanddate( $options['from'], true ) ) . '<br />'; |
| | 604 | + } |
| | 605 | + if( !wfEmptyMsg( 'rclegend', wfMsg('rclegend') ) ) { |
| | 606 | + $note .= wfMsgExt( 'rclegend', array('parseinline') ) . '<br />'; |
| | 607 | + } |
| 610 | 608 | |
| 611 | 609 | # Sort data for display and make sure it's unique after we've added user data. |
| 612 | 610 | $wgRCLinkLimits[] = $options['limit']; |
| — | — | @@ -661,6 +659,6 @@ |
| 662 | 660 | $rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter' ), |
| 663 | 661 | $cl, $dl, $hl ); |
| 664 | 662 | $rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter' ), $tl ); |
| 665 | | - return "$note<br />$rclinks<br />$rclistfrom"; |
| | 663 | + return "{$note}$rclinks<br />$rclistfrom"; |
| 666 | 664 | } |
| 667 | 665 | } |