doc fix

[lhc/web/wiklou.git] / includes / SpecialWatchlist.php

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index c8a734e..dc1277a 100644 (file)
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -9,7 +9,6 @@
  *
  */
 require_once( 'SpecialRecentchanges.php' );
-require_once( 'WatchedItem.php' );
 
 /**
  * Constructor
@@ -43,7 +42,7 @@ function wfSpecialWatchlist( $par ) {
        /* float */ 'days' => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */
        /* bool  */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ),
        /* bool  */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ),
-                               'namespace' => 'all',
+       /* ?     */ 'namespace' => 'all',
        );
 
        extract($defaults);
@@ -90,13 +89,14 @@ function wfSpecialWatchlist( $par ) {
                                if( $wl->removeWatch() === false ) {
                                        $wgOut->addHTML( "<br />\n" . wfMsg( 'couldntremove', htmlspecialchars($one) ) );
                                } else {
+                                       wfRunHooks('UnwatchArticle', array(&$wgUser, new Article($t)));
                                        $wgOut->addHTML( ' (' . htmlspecialchars($one) . ')' );
                                }
                        } else {
                                $wgOut->addHTML( "<br />\n" . wfMsg( 'iteminvalidname', htmlspecialchars($one) ) );
                        }
                }
-               $wgOut->addHTML( "done.</p>\n" );
+               $wgOut->addHTML( "<br />\n" . wfMsg( 'wldone' ) . "</p>\n" );
        }
 
        if ( $wgUseWatchlistCache ) {
@@ -291,7 +291,7 @@ function wfSpecialWatchlist( $par ) {
          rc_user AS rev_user, rc_user_text AS rev_user_text,
          rc_timestamp AS rev_timestamp, rc_minor AS rev_minor_edit,
          rc_this_oldid AS rev_id,
-         rc_last_oldid,
+         rc_last_oldid, rc_id, rc_patrolled,
          rc_new AS page_is_new,wl_notificationtimestamp
          FROM $watchlist,$recentchanges,$page
          WHERE wl_user=$uid
@@ -314,7 +314,7 @@ function wfSpecialWatchlist( $par ) {
 
        if($days >= 1)
                $wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ),
-                       $wgLang->formatNum( $days ) ) . '<br />' , false );
+                       $wgLang->formatNum( $days ), $wgLang->timeAndDate( wfTimestampNow(), true ) ) . '<br />' , false );
        elseif($days > 0)
                $wgOut->addWikiText( wfMsg( 'wlnote', $wgLang->formatNum( $numRows ),
                        $wgLang->formatNum( round($days*24) ) ) . '<br />' , false );
@@ -342,12 +342,12 @@ function wfSpecialWatchlist( $par ) {
        # Form for namespace filtering
        $thisAction = $thisTitle->escapeLocalUrl();
        $nsForm  = "<form method=\"post\" action=\"{$thisAction}\">\n";
-       $nsForm .= "<label for=\"namespace\">" . wfMsg( 'namespace' ) . "</label> ";
+       $nsForm .= "<label for=\"namespace\">" . wfMsgExt( 'namespace', array( 'parseinline') ) . "</label> ";
        $nsForm .= HTMLnamespaceselector( $nameSpace, '' ) . "\n";
        $nsForm .= ( $hideOwn ? "<input type=\"hidden\" name=\"hideown\" value=\"1\" />\n" : "" );
        $nsForm .= ( $hideBots ? "<input type=\"hidden\" name=\"hidebots\" value=\"1\" />\n" : "" );
        $nsForm .= "<input type=\"hidden\" name=\"days\" value=\"" . $days . "\" />\n";
-       $nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
+       $nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgExt( 'allpagessubmit', array( 'escape') ) . "\" />\n";
        $nsForm .= "</form>\n";
        $wgOut->addHTML( $nsForm );
 
@@ -418,6 +418,9 @@ function wlDaysLink( $d, $page, $options = array() ) {
        return $s;
 }
 
+/**
+ * Returns html
+ */
 function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
        $hours = array( 1, 2, 6, 12 );
        $days = array( 1, 3, 7 );
@@ -430,7 +433,8 @@ function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
        foreach( $days as $d ) {
                $days[$i++] = wlDaysLink( $d, $page, $options );
        }
-       return wfMsg ('wlshowlast',
+       return wfMsgExt('wlshowlast',
+               array('parseinline', 'replaceafter'),
                implode(' | ', $hours),
                implode(' | ', $days),
                wlDaysLink( 0, $page, $options ) );