Update to r32375 / bug 11874 -- !important may have whitespace between ! and important

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

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 7565481..5553c18 100644 (file)
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -172,13 +172,9 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
        while( $row = $dbr->fetchObject( $res ) ){
                $rows[] = $row;
                if ( !$feedFormat ) {
-                       // User page link
-                       $title = Title::makeTitleSafe( NS_USER, $row->rc_user_text );
-                       $batch->addObj( $title );
-
-                       // User talk
-                       $title = Title::makeTitleSafe( NS_USER_TALK, $row->rc_user_text );
-                       $batch->addObj( $title );
+                       // User page and talk links
+                       $batch->add( NS_USER, $row->rc_user_text  );
+                       $batch->add( NS_USER_TALK, $row->rc_user_text  );
                }
 
        }
@@ -221,7 +217,7 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 
                // And now for the content
                $wgOut->setSyndicated( true );
-
+               
                $list = ChangesList::newFromUser( $wgUser );
                
                if ( $wgAllowCategorizedRecentChanges ) {
@@ -233,6 +229,10 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 
                $s = $list->beginRecentChangesList();
                $counter = 1;
+
+               $showWatcherCount = $wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' );
+               $watcherCache = array();
+
                foreach( $rows as $obj ){
                        if( $limit == 0) {
                                break;
@@ -251,13 +251,19 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
                                        $rc->notificationtimestamp = false;
                                }
 
-                               if ($wgRCShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
-                                       $sql3 = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_title='" . $dbr->strencode($obj->rc_title) ."' AND wl_namespace=$obj->rc_namespace" ;
-                                       $res3 = $dbr->query( $sql3, 'wfSpecialRecentChanges');
-                                       $x = $dbr->fetchObject( $res3 );
-                                       $rc->numberofWatchingusers = $x->n;
-                               } else {
-                                       $rc->numberofWatchingusers = 0;
+                               $rc->numberofWatchingusers = 0; // Default
+                               if ($showWatcherCount && $obj->rc_namespace >= 0) {
+                                       if (!isset($watcherCache[$obj->rc_namespace][$obj->rc_title])) {
+                                               $watcherCache[$obj->rc_namespace][$obj->rc_title] =
+                                                       $dbr->selectField( 'watchlist',
+                                                               'COUNT(*)',
+                                                               array(
+                                                                       'wl_namespace' => $obj->rc_namespace,
+                                                                       'wl_title' => $obj->rc_title,
+                                                               ),
+                                                               __METHOD__ . '-watchers' );
+                                       }
+                                       $rc->numberofWatchingusers = $watcherCache[$obj->rc_namespace][$obj->rc_title];
                                }
                                $s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
                                --$limit;
@@ -269,6 +275,10 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 }
 
 function rcFilterByCategories ( &$rows , $categories , $any ) {
+       if( empty( $categories ) ) {
+               return;
+       }
+       
        # Filter categories
        $cats = array () ;
        foreach ( $categories AS $cat ) {
@@ -281,7 +291,7 @@ function rcFilterByCategories ( &$rows , $categories , $any ) {
        $articles = array () ;
        $a2r = array () ;
        foreach ( $rows AS $k => $r ) {
-               $nt = Title::newFromText ( $r->rc_title , $r->rc_namespace ) ;
+               $nt = Title::makeTitle( $r->rc_title , $r->rc_namespace );
                $id = $nt->getArticleID() ;
                if ( $id == 0 ) continue ; # Page might have been deleted...
                if ( !in_array ( $id , $articles ) ) {
@@ -316,6 +326,13 @@ function rcFilterByCategories ( &$rows , $categories , $any ) {
 function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
        global $messageMemc, $wgFeedCacheTimeout;
        global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
+       global $wgFeed;
+       
+       if ( !$wgFeed ) {
+               global $wgOut;
+               $wgOut->addWikiMsg( 'feed-unavailable' );
+               return;
+       }
 
        if( !isset( $wgFeedClasses[$feedFormat] ) ) {
                wfHttpError( 500, "Internal Server Error", "Unsupported feed type." );
@@ -332,6 +349,14 @@ function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
                htmlspecialchars( wfMsgForContent( 'recentchanges-feed-description' ) ),
                $wgTitle->getFullUrl() );
 
+       //purge cache if requested
+       global $wgRequest, $wgUser;
+       $purge = $wgRequest->getVal( 'action' ) == 'purge';
+       if ( $purge && $wgUser->isAllowed('purge') ) {
+               $messageMemc->delete( $timekey );
+               $messageMemc->delete( $key );
+       }
+
        /**
         * Bumping around loading up diffs can be pretty slow, so where
         * possible we want to cache the feed output so the next visitor
@@ -373,9 +398,12 @@ function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
        return true;
 }
 
+/**
+ * @todo document
+ * @param $rows Database resource with recentchanges rows
+ */
 function rcDoOutputFeed( $rows, &$feed ) {
-       $fname = 'rcDoOutputFeed';
-       wfProfileIn( $fname );
+       wfProfileIn( __METHOD__ );
 
        $feed->outHeader();
 
@@ -400,15 +428,15 @@ function rcDoOutputFeed( $rows, &$feed ) {
                $item = new FeedItem(
                        $title->getPrefixedText(),
                        rcFormatDiff( $obj ),
-                       $title->getFullURL(),
+                       $title->getFullURL( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ),
                        $obj->rc_timestamp,
-                       $obj->rc_user_text,
+                       ($obj->rc_deleted & Revision::DELETED_USER) ? wfMsgHtml('rev-deleted-user') : $obj->rc_user_text,
                        $talkpage->getFullURL()
                        );
                $feed->outItem( $item );
        }
        $feed->outFooter();
-       wfProfileOut( $fname );
+       wfProfileOut( __METHOD__ );
 }
 
 /**
@@ -606,23 +634,45 @@ function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
  * Format a diff for the newsfeed
  */
 function rcFormatDiff( $row ) {
+       global $wgUser;
+
        $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
        $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp );
+       $actiontext = '';
+       if( $row->rc_type == RC_LOG ) {
+               if( $row->rc_deleted & LogPage::DELETED_ACTION ) {
+                       $actiontext = wfMsgHtml('rev-deleted-event');
+               } else {
+                       $actiontext = LogPage::actionText( $row->rc_log_type, $row->rc_log_action, 
+                               $titleObj, $wgUser->getSkin(), LogPage::extractParams($row->rc_params,true,true) );
+               }
+       }
        return rcFormatDiffRow( $titleObj,
                $row->rc_last_oldid, $row->rc_this_oldid,
                $timestamp,
-               $row->rc_comment );
+               ($row->rc_deleted & Revision::DELETED_COMMENT) ? wfMsgHtml('rev-deleted-comment') : $row->rc_comment,
+               $actiontext );
 }
 
-function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment ) {
+function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext='' ) {
        global $wgFeedDiffCutoff, $wgContLang, $wgUser;
        $fname = 'rcFormatDiff';
        wfProfileIn( $fname );
 
        $skin = $wgUser->getSkin();
+       # log enties
+       if( $actiontext ) {
+               $comment = "$actiontext $comment";
+       }
        $completeText = '<p>' . $skin->formatComment( $comment ) . "</p>\n";
 
-       if( $title->getNamespace() >= 0 && $title->userCan( 'read' ) ) {
+       //NOTE: Check permissions for anonymous users, not current user.
+       //      No "privileged" version should end up in the cache.
+       //      Most feed readers will not log in anway.
+       $anon = new User();
+       $accErrors = $title->getUserPermissionsErrors( 'read', $anon, true );
+
+       if( $title->getNamespace() >= 0 && !$accErrors ) {
                if( $oldid ) {
                        wfProfileIn( "$fname-dodiff" );