API: Change acprop description to allow for future expansion

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

diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index d413667..ee01dfa 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' );
@@ -25,18 +25,19 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
        $sk = $wgUser->getSkin();
 
        if (is_null($target)) {
-               $wgOut->errorpage( 'notargettitle', 'notargettext' );
+               $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
                return;
        }
        $nt = Title::newFromURL( $target );
        if( !$nt ) {
-               $wgOut->errorpage( 'notargettitle', 'notargettext' );
+               $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
                return;
        }
        $id = $nt->getArticleId();
 
        $wgOut->setPageTitle( wfMsg( 'recentchangeslinked-title', $nt->getPrefixedText() ) );
-       $wgOut->setSubtitle( htmlspecialchars( wfMsg( 'rclsub', $nt->getPrefixedText() ) ) );
+       $wgOut->setSyndicated();
+       $wgOut->setFeedAppendQuery( "target=" . urlencode( $target ) );
 
        if ( ! $days ) {
                $days = (int)$wgUser->getOption( 'rcdays', 7 );
@@ -67,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_deleted,
+               rc_user,rc_comment,rc_user_text,rc_timestamp,rc_minor,rc_log_type,rc_log_action,rc_params,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
@@ -75,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,
@@ -94,6 +95,9 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
                                rc_type,
                                rc_old_len,
                                rc_new_len,
+                               rc_log_type,
+                               rc_log_action,
+                               rc_params,
                                rc_deleted
 " . ($uid ? ",wl_user" : "") . "
            FROM $categorylinks, $recentchanges
@@ -124,6 +128,9 @@ $GROUPBY
                        rc_type,
                        rc_old_len,
                        rc_new_len,
+                       rc_log_type,
+                       rc_log_action,
+                       rc_params,
                        rc_deleted
 " . ($uid ? ",wl_user" : "") . "
    FROM $pagelinks, $recentchanges
@@ -163,43 +170,26 @@ $GROUPBY
                        $rc->counter = $counter++;
                        $s .= $list->recentChangesLine( $rc , !empty( $obj->wl_user) );
                        --$limit;
-                       $rchanges[] = $rc;
+                       $rchanges[] = $obj;
                }
        } else {
-               $wgOut->addWikiText( wfMsg('recentchangeslinked-noresult') );
+               $wgOut->addWikiMsg('recentchangeslinked-noresult');
        }
        $s .= $list->endRecentChangesList();
 
        $dbr->freeResult( $res );
        $wgOut->addHTML( $s );
 
-       global $wgSitename, $wgFeedClasses, $wgTitle, $wgContLanguageCode;
+       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() );
                
-               $feedItems = array();
-               foreach( $rchanges as $rc ) {
-                       $title = $rc->getTitle();
-                       $titleStr = $title->getFullText();
-                       $titleUrl = $title->getFullUrl();
-                       $timestamp = $rc->getAttribute('rc_timestamp');
-                       $user = $rc->getAttribute('rc_user_text');
-                       $comment = $rc->getAttribute('rc_comment');
-                       $message = ( $comment ? 'recentchangeslinked-feed-entry-comment' : 'recentchangeslinked-feed-entry' );
-                       $content = wfMsgHtml( $message, $user, $titleStr, $comment );
-                       
-                       $feedItems[] = new FeedItem( $titleStr, $content, $titleUrl, $timestamp, $user );
-               }
-               
+               require_once( "SpecialRecentchanges.php" );
                $wgOut->disable();
-               $feed->outHeader();
-               foreach( $feedItems as &$item ) {
-                       $feed->outItem( $item );
-               }
-               $feed->outFooter();
+               rcDoOutputFeed( $rchanges, $feed );
        }
 }