| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -220,25 +220,21 @@ |
| 221 | 221 | $numRows = $dbr->numRows( $res ); |
| 222 | 222 | |
| 223 | 223 | /* Start bottom header */ |
| 224 | | - $wgOut->addHTML( "<hr />\n" ); |
| 225 | 224 | |
| 226 | | - if($days >= 1) { |
| 227 | | - $wgOut->addHTML( |
| 228 | | - wfMsgExt( 'rcnote', 'parseinline', |
| | 225 | + $wlInfo = ''; |
| | 226 | + if( $days >= 1 ) { |
| | 227 | + $wlInfo = wfMsgExt( 'rcnote', 'parseinline', |
| 229 | 228 | $wgLang->formatNum( $numRows ), |
| 230 | 229 | $wgLang->formatNum( $days ), |
| 231 | 230 | $wgLang->timeAndDate( wfTimestampNow(), true ), |
| 232 | 231 | $wgLang->date( wfTimestampNow(), true ), |
| 233 | 232 | $wgLang->time( wfTimestampNow(), true ) |
| 234 | | - ) . '<br />' |
| 235 | | - ); |
| 236 | | - } elseif($days > 0) { |
| 237 | | - $wgOut->addHtml( |
| 238 | | - wfMsgExt( 'wlnote', 'parseinline', |
| | 233 | + ) . '<br />'; |
| | 234 | + } elseif( $days > 0 ) { |
| | 235 | + $wlInfo = wfMsgExt( 'wlnote', 'parseinline', |
| 239 | 236 | $wgLang->formatNum( $numRows ), |
| 240 | 237 | $wgLang->formatNum( round($days*24) ) |
| 241 | | - ) . '<br />' |
| 242 | | - ); |
| | 238 | + ) . '<br />'; |
| 243 | 239 | } |
| 244 | 240 | |
| 245 | 241 | $cutofflinks = "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n"; |
| — | — | @@ -277,6 +273,7 @@ |
| 278 | 274 | $form .= Xml::openElement( 'legend', array( 'id' => 'mw-watchlist-legend' ) ); |
| 279 | 275 | $form .= wfMsgExt( 'watchlist-options', array('escape') ); |
| 280 | 276 | $form .= Xml::closeElement( 'legend' ); |
| | 277 | + $form .= $wlInfo; |
| 281 | 278 | $form .= $cutofflinks; |
| 282 | 279 | $form .= implode( ' | ', $links ); |
| 283 | 280 | $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) ); |