Revert 30130, completely breaks editing with fatal PHP error.

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

diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index bcc871c..9bf957f 100644 (file)
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -14,7 +14,7 @@ require_once( 'SpecialRecentchanges.php' );
  * @param string $par parent page we will look at
  */
 function wfSpecialRecentchangeslinked( $par = NULL ) {
-       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest;
+       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgTitle;
        $fname = 'wfSpecialRecentchangeslinked';
 
        $days = $wgRequest->getInt( 'days' );
@@ -24,30 +24,27 @@ 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->setSubtitle( htmlspecialchars( wfMsg( 'rclsub', $nt->getPrefixedText() ) ) );
+       $wgOut->setPageTitle( wfMsg( 'recentchangeslinked-title', $nt->getPrefixedText() ) );
+       $wgOut->setSyndicated();
+       $wgOut->setFeedAppendQuery( "target=" . urlencode( $target ) );
 
        if ( ! $days ) {
                $days = (int)$wgUser->getOption( 'rcdays', 7 );
        }
        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);
@@ -71,7 +68,7 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
 
        $GROUPBY = "
        GROUP BY rc_cur_id,rc_namespace,rc_title,
-               rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,
+               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
@@ -79,7 +76,7 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
 
        // If target is a Category, use categorylinks and invert from and to
        if( $nt->getNamespace() == NS_CATEGORY ) {
-               $catkey = $dbr->addQuotes( $nt->getDBKey() );
+               $catkey = $dbr->addQuotes( $nt->getDBkey() );
                $sql = "SELECT /* wfSpecialRecentchangeslinked */
                                rc_id,
                                rc_cur_id,
@@ -97,7 +94,8 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                                rc_patrolled,
                                rc_type,
                                rc_old_len,
-                               rc_new_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 " : "") . "
@@ -126,7 +124,8 @@ $GROUPBY
                        rc_patrolled,
                        rc_type,
                        rc_old_len,
-                       rc_new_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 " : "") . "
@@ -140,7 +139,7 @@ $GROUPBY
        }
        $res = $dbr->query( $sql, $fname );
 
-       $wgOut->addHTML("&lt; ".$sk->makeKnownLinkObj($nt, "", "redirect=no" )."<br />\n");
+       $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 />" );
 
@@ -154,6 +153,7 @@ $GROUPBY
        $s = $list->beginRecentChangesList();
        $count = $dbr->numRows( $res );
 
+       $rchanges = array();
        if ( $count ) {
                $counter = 1;
                while ( $limit ) {
@@ -164,14 +164,27 @@ $GROUPBY
                        $rc->counter = $counter++;
                        $s .= $list->recentChangesLine( $rc , !empty( $obj->wl_user) );
                        --$limit;
+                       $rchanges[] = $obj;
                }
        } else {
-               $wgOut->addHTML( '<p>' . wfMsg('recentchangeslinked-noresult') . '</p' );
+               $wgOut->addWikiText( wfMsg('recentchangeslinked-noresult') );
        }
        $s .= $list->endRecentChangesList();
 
        $dbr->freeResult( $res );
        $wgOut->addHTML( $s );
+
+       global $wgSitename, $wgFeedClasses, $wgContLanguageCode;
+       $feedFormat = $wgRequest->getVal( 'feed' );
+       if( $feedFormat && isset( $wgFeedClasses[$feedFormat] ) ) {
+               $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchangeslinked-title', $nt->getPrefixedText() ) . ' [' . $wgContLanguageCode . ']';
+               $feed = new $wgFeedClasses[$feedFormat]( $feedTitle,
+                       htmlspecialchars( wfMsgForContent('recentchangeslinked') ), $wgTitle->getFullUrl() );
+               
+               require_once( "SpecialRecentchanges.php" );
+               $wgOut->disable();
+               rcDoOutputFeed( $rchanges, $feed );
+       }
 }
 
-?>
+