This is giving me a syntax error. It looks gross this way, but I can't think of any...

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

diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index 59a3beb..2a8ac32 100644 (file)
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -1,8 +1,7 @@
 <?php
 /**
  * This is to display changes made to all articles linked in an article.
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
@@ -25,32 +24,26 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
        $wgOut->setPagetitle( wfMsg( 'recentchangeslinked' ) );
        $sk = $wgUser->getSkin();
 
-       # Validate the title
-       $nt = Title::newFromURL( $target );
-       if( !is_object( $nt ) ) {
-               $wgOut->errorPage( 'notargettitle', 'notargettext' );
+       if (is_null($target)) {
+               $wgOut->errorpage( 'notargettitle', 'notargettext' );
                return;
        }
-       
-       # Check for existence
-       # Do a quiet redirect back to the page itself if it doesn't
-       if( !$nt->exists() ) {
-               $wgOut->redirect( $nt->getLocalUrl() );
+       $nt = Title::newFromURL( $target );
+       if( !$nt ) {
+               $wgOut->errorpage( 'notargettitle', 'notargettext' );
                return;
        }
-
        $id = $nt->getArticleId();
 
+       $wgOut->setPageTitle( wfMsg( 'recentchangeslinked-title', $nt->getPrefixedText() ) );
        $wgOut->setSubtitle( htmlspecialchars( wfMsg( 'rclsub', $nt->getPrefixedText() ) ) );
 
        if ( ! $days ) {
-               $days = $wgUser->getOption( 'rcdays' );
-               if ( ! $days ) { $days = 7; }
+               $days = (int)$wgUser->getOption( 'rcdays', 7 );
        }
-       $days = (int)$days;
-       list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
+       list( $limit, /* offset */ ) = wfCheckLimits( 100, 'rclimit' );
 
-       $dbr =& wfGetDB( DB_SLAVE );
+       $dbr = wfGetDB( DB_SLAVE,'recentchangeslinked' );
        $cutoff = $dbr->timestamp( time() - ( $days * 86400 ) );
 
        $hideminor = ($hideminor ? 1 : 0);
@@ -67,14 +60,15 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                $cmq = 'AND rc_minor=0';
        } else { $cmq = ''; }
 
-       extract( $dbr->tableNames( 'recentchanges', 'categorylinks', 'pagelinks', 'revision', 'page' , "watchlist" ) );
+       list($recentchanges, $categorylinks, $pagelinks, $watchlist) = 
+           $dbr->tableNamesN( 'recentchanges', 'categorylinks', 'pagelinks', "watchlist" );
 
        $uid = $wgUser->getID();
 
        $GROUPBY = "
        GROUP BY rc_cur_id,rc_namespace,rc_title,
-               rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,
-               rc_new, rc_id, rc_this_oldid, rc_last_oldid, rc_bot, rc_patrolled, rc_type
+               rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,rc_deleted,
+               rc_new, rc_id, rc_this_oldid, rc_last_oldid, rc_bot, rc_patrolled, rc_type, rc_old_len, rc_new_len
 " . ($uid ? ",wl_user" : "") . "
                ORDER BY rc_timestamp DESC
        LIMIT {$limit}";
@@ -97,7 +91,10 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                                rc_bot,
                                rc_new,
                                rc_patrolled,
-                               rc_type
+                               rc_type,
+                               rc_old_len,
+                               rc_new_len,
+                               rc_deleted
 " . ($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 " : "") . "
@@ -124,7 +121,10 @@ $GROUPBY
                        rc_bot,
                        rc_new,
                        rc_patrolled,
-                       rc_type
+                       rc_type,
+                       rc_old_len,
+                       rc_new_len,
+                       rc_deleted
 " . ($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 " : "") . "
@@ -138,8 +138,8 @@ $GROUPBY
        }
        $res = $dbr->query( $sql, $fname );
 
-       $wgOut->addHTML("&lt; ".$sk->makeKnownLinkObj($nt, "", "redirect=no" )."<br />\n");
-       $note = wfMsg( "rcnote", $limit, $days, $wgLang->timeAndDate( wfTimestampNow(), true ) );
+       $wgOut->addHTML("&lt; ".$sk->makeLinkObj($nt, "", "redirect=no" )."<br />\n");
+       $note = wfMsgExt( "rcnote", array ( 'parseinline' ), $limit, $days, $wgLang->timeAndDate( wfTimestampNow(), true ) );
        $wgOut->addHTML( "<hr />\n{$note}\n<br />" );
 
        $note = rcDayLimitlinks( $days, $limit, "Recentchangeslinked",
@@ -152,15 +152,19 @@ $GROUPBY
        $s = $list->beginRecentChangesList();
        $count = $dbr->numRows( $res );
 
-       $counter = 1;
-       while ( $limit ) {
-               if ( 0 == $count ) { break; }
-               $obj = $dbr->fetchObject( $res );
-               --$count;
-               $rc = RecentChange::newFromRow( $obj );
-               $rc->counter = $counter++;
-               $s .= $list->recentChangesLine( $rc , !empty( $obj->wl_user) );
-               --$limit;
+       if ( $count ) {
+               $counter = 1;
+               while ( $limit ) {
+                       if ( 0 == $count ) { break; }
+                       $obj = $dbr->fetchObject( $res );
+                       --$count;
+                       $rc = RecentChange::newFromRow( $obj );
+                       $rc->counter = $counter++;
+                       $s .= $list->recentChangesLine( $rc , !empty( $obj->wl_user) );
+                       --$limit;
+               }
+       } else {
+               $wgOut->addWikiText( wfMsg('recentchangeslinked-noresult') );
        }
        $s .= $list->endRecentChangesList();
 
@@ -168,4 +172,4 @@ $GROUPBY
        $wgOut->addHTML( $s );
 }
 
-?>
+