split off new function wfBacktrace() from wfDebugDieBacktrace()

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

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index 095bb7f..a60324d 100644 (file)
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -1,13 +1,26 @@
 <?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 
+/**
+ *
+ */
 require_once( "QueryPage.php" );
 
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class NewPagesPage extends QueryPage {
 
        function getName() {
                return "Newpages";
        }
-       
+
        function isExpensive() {
                # Indexed on RC, and will *not* work with querycache yet.
                return false;
@@ -15,55 +28,84 @@ class NewPagesPage extends QueryPage {
        }
 
        function getSQL() {
+               global $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
+               $usepatrol = ( $wgUseRCPatrol && $wgUser->isLoggedIn() &&
+                              ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
+               $dbr =& wfGetDB( DB_SLAVE );
+               extract( $dbr->tableNames( 'recentchanges', 'page', 'text' ) );
+
+               # FIXME: text will break with compression
                return
                        "SELECT 'Newpages' as type,
                                rc_namespace AS namespace,
                                rc_title AS title,
                                rc_cur_id AS value,
-                               
                                rc_user AS user,
                                rc_user_text AS user_text,
                                rc_comment as comment,
                                rc_timestamp AS timestamp,
-                               length(cur_text) as length,
-                               cur_text as text
-                       FROM recentchanges,cur
-                       WHERE rc_cur_id=cur_id AND rc_new=1
-                         AND rc_namespace=0 AND cur_is_redirect=0";
+                               '{$usepatrol}' as usepatrol,
+                               rc_patrolled AS patrolled,
+                               rc_id AS rcid,
+                               page_len as length,
+                               page_latest as rev_id
+                       FROM $recentchanges,$page
+                       WHERE rc_cur_id=page_id AND rc_new=1
+                         AND rc_namespace=".NS_MAIN." AND page_is_redirect=0";
        }
 
        function formatResult( $skin, $result ) {
-               global $wgLang;
+               global $wgLang, $wgContLang, $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
                $u = $result->user;
                $ut = $result->user_text;
 
                $length = wfMsg( "nbytes", $wgLang->formatNum( $result->length ) );
-               $c = $skin->formatComment($result->comment );
 
-               if ( 0 == $u ) { # not by a logged-in user
+               if ( $u == 0 ) { # not by a logged-in user
                        $ul = $ut;
                }
                else {
-                       $ul = $skin->makeLink( $wgLang->getNsText(NS_USER) . ":{$ut}", $ut );
+                       $ul = $skin->makeLink( $wgContLang->getNsText(NS_USER) . ":{$ut}", $ut );
                }
 
                $d = $wgLang->timeanddate( $result->timestamp, true );
-               $link = $skin->makeKnownLink( $result->title, "" );
+
+               # Since there is no diff link, we need to give users a way to
+               # mark the article as patrolled if it isn't already
+               if ( $wgUseRCPatrol && !is_null ( $result->usepatrol ) && $result->usepatrol &&
+                    $result->patrolled == 0 && $wgUser->isLoggedIn() &&
+                    ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
+                       $link = $skin->makeKnownLink( $result->title, '', "rcid={$result->rcid}" );
+               else
+                       $link = $skin->makeKnownLink( $result->title, '' );
+
                $s = "{$d} {$link} ({$length}) . . {$ul}";
 
-               if ( "" != $c && "*" != $c ) {
-                       $s .= " <em>({$c})</em>";
-               }
+               $s .= $skin->commentBlock( $result->comment );
 
                return $s;
        }
+       
+       function feedItemDesc( $row ) {
+               if( isset( $row->rev_id ) ) {
+                       $revision = Revision::newFromId( $row->rev_id );
+                       if( $revision ) {
+                               return '<p>' . htmlspecialchars( wfMsg( 'summary' ) ) . ': ' . $text . "</p>\n<hr />\n<div>" .
+                                       nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";
+                       }
+               }
+               return parent::feedItemDesc( $row );
+       }
 }
 
+/**
+ * constructor
+ */
 function wfSpecialNewpages()
 {
        global $wgRequest;
     list( $limit, $offset ) = wfCheckLimits();
-    
+
     $npp = new NewPagesPage();
 
     if( !$npp->doFeed( $wgRequest->getVal( 'feed' ) ) ) {