Bug 6031 (feature request for __NOGALLERY__ on category pages) fixed

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

diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index f2ea57e..aab5e49 100644 (file)
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -15,27 +15,32 @@ require_once( 'SpecialRecentchanges.php' );
  * @param string $par parent page we will look at
  */
 function wfSpecialRecentchangeslinked( $par = NULL ) {
-       global $wgUser, $wgOut, $wgContLang, $wgRequest;
+       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest;
        $fname = 'wfSpecialRecentchangeslinked';
 
        $days = $wgRequest->getInt( 'days' );
        $target = isset($par) ? $par : $wgRequest->getText( 'target' );
        $hideminor = $wgRequest->getBool( 'hideminor' ) ? 1 : 0;
-       
+
        $wgOut->setPagetitle( wfMsg( 'recentchangeslinked' ) );
        $sk = $wgUser->getSkin();
 
-       if (is_null($target)) {
-               $wgOut->errorpage( 'notargettitle', 'notargettext' );
+       # Validate the title
+       $nt = Title::newFromURL( $target );
+       if( !is_object( $nt ) ) {
+               $wgOut->errorPage( 'notargettitle', 'notargettext' );
                return;
        }
-       $nt = Title::newFromURL( $target );
-       if( !$nt ) {
-               $wgOut->errorpage( 'notargettitle', 'notargettext' );
+       
+       # Check for existence
+       # Do a quiet redirect back to the page itself if it doesn't
+       if( !$nt->exists() ) {
+               $wgOut->redirect( $nt->getLocalUrl() );
                return;
        }
+
        $id = $nt->getArticleId();
-       
+
        $wgOut->setSubtitle( htmlspecialchars( wfMsg( 'rclsub', $nt->getPrefixedText() ) ) );
 
        if ( ! $days ) {
@@ -62,36 +67,40 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                $cmq = 'AND rc_minor=0';
        } else { $cmq = ''; }
 
-       extract( $dbr->tableNames( 'recentchanges', 'categorylinks', 'pagelinks', 'revision', 'page' ) );
-       
+       extract( $dbr->tableNames( 'recentchanges', 'categorylinks', 'pagelinks', 'revision', 'page' , "watchlist" ) );
+
+       $uid = $wgUser->getID();
+
        // If target is a Category, use categorylinks and invert from and to
        if( $nt->getNamespace() == NS_CATEGORY ) {
                $catkey = $dbr->addQuotes( $nt->getDBKey() );
                $sql = "SELECT /* wfSpecialRecentchangeslinked */
-                               rc_id,
-                               rc_cur_id,
-                               rc_namespace,
-                               rc_title,
-                               rc_this_oldid,
-                               rc_last_oldid,
-                               rc_user,
-                               rc_comment,
-                       rc_user_text,
-                               rc_timestamp,
-                               rc_minor,
-                                       rc_new,
-                                       rc_patrolled,
-                                       rc_type
-            FROM $categorylinks, $recentchanges
-           WHERE rc_timestamp > '{$cutoff}'
-             {$cmq}
-             AND cl_from=rc_cur_id
-             AND cl_to=$catkey
-        GROUP BY rc_cur_id,rc_namespace,rc_title,
-                 rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,
-                 rc_new
-        ORDER BY rc_timestamp DESC
-           LIMIT {$limit};
+                               rc_id,
+                               rc_cur_id,
+                               rc_namespace,
+                               rc_title,
+                               rc_this_oldid,
+                               rc_last_oldid,
+                               rc_user,
+                               rc_comment,
+                               rc_user_text,
+                               rc_timestamp,
+                               rc_minor,
+                               rc_new,
+                               rc_patrolled,
+                               rc_type
+" . ($uid ? ",wl_user" : "") . "
+           FROM $categorylinks, $recentchanges
+" . ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") . "
+          WHERE rc_timestamp > '{$cutoff}'
+            {$cmq}
+            AND cl_from=rc_cur_id
+            AND cl_to=$catkey
+       GROUP BY rc_cur_id,rc_namespace,rc_title,
+               rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,
+               rc_new
+               ORDER BY rc_timestamp DESC
+       LIMIT {$limit};
  ";
        } else {
                $sql =
@@ -100,7 +109,7 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                        rc_cur_id,
                        rc_namespace,
                        rc_title,
-               rc_user,
+                       rc_user,
                        rc_comment,
                        rc_user_text,
                        rc_this_oldid,
@@ -110,43 +119,47 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                        rc_new,
                        rc_patrolled,
                        rc_type
-    FROM $pagelinks, $recentchanges
+" . ($uid ? ",wl_user" : "") . "
+   FROM $pagelinks, $recentchanges
+" . ($uid ? " LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") . "
    WHERE rc_timestamp > '{$cutoff}'
        {$cmq}
      AND pl_namespace=rc_namespace
      AND pl_title=rc_title
      AND pl_from=$id
 GROUP BY rc_cur_id,rc_namespace,rc_title,
-         rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,
-         rc_new
+        rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,
+        rc_new
 ORDER BY rc_timestamp DESC
    LIMIT {$limit}";
        }
        $res = $dbr->query( $sql, $fname );
 
        $wgOut->addHTML("&lt; ".$sk->makeKnownLinkObj($nt, "", "redirect=no" )."<br />\n");
-       $note = wfMsg( "rcnote", $limit, $days );
+       $note = wfMsg( "rcnote", $limit, $days, $wgLang->timeAndDate( wfTimestampNow(), true ) );
        $wgOut->addHTML( "<hr />\n{$note}\n<br />" );
 
        $note = rcDayLimitlinks( $days, $limit, "Recentchangeslinked",
-                                 "target=" . $nt->getPrefixedURL() . "&hideminor={$hideminor}",
-                                 false, $mlink );
+                                "target=" . $nt->getPrefixedURL() . "&hideminor={$hideminor}",
+                                false, $mlink );
 
        $wgOut->addHTML( $note."\n" );
 
        $list = ChangesList::newFromUser( $wgUser );
        $s = $list->beginRecentChangesList();
        $count = $dbr->numRows( $res );
-       
+
        $counter = 1;
        while ( $limit ) {
                if ( 0 == $count ) { break; }
                $obj = $dbr->fetchObject( $res );
                --$count;
+#              print_r ( $obj ) ;
+#              print "<br/>\n" ;
 
                $rc = RecentChange::newFromRow( $obj );
                $rc->counter = $counter++;
-               $s .= $list->recentChangesLine( $rc );
+               $s .= $list->recentChangesLine( $rc , !empty( $obj->wl_user) );
                --$limit;
        }
        $s .= $list->endRecentChangesList();