*gasp*

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

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index 6f5fedb..a60324d 100644 (file)
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -1,7 +1,20 @@
 <?php
-
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
 require_once( "QueryPage.php" );
 
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class NewPagesPage extends QueryPage {
 
        function getName() {
@@ -15,11 +28,13 @@ class NewPagesPage extends QueryPage {
        }
 
        function getSQL() {
-               global $wgUser, $wgOnlySysopsCanPatrol;
-               $usepatrol = ( $wgUser->getID() != 0 && ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
+               global $wgUser, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
+               $usepatrol = ( $wgUseRCPatrol && $wgUser->isLoggedIn() &&
+                              ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) ) ? 1 : 0;
                $dbr =& wfGetDB( DB_SLAVE );
-               extract( $dbr->tableNames( 'recentchanges', 'cur' ) );
+               extract( $dbr->tableNames( 'recentchanges', 'page', 'text' ) );
 
+               # FIXME: text will break with compression
                return
                        "SELECT 'Newpages' as type,
                                rc_namespace AS namespace,
@@ -32,48 +47,60 @@ class NewPagesPage extends QueryPage {
                                '{$usepatrol}' as usepatrol,
                                rc_patrolled AS patrolled,
                                rc_id AS rcid,
-                               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";
+                               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, $wgUser, $wgOnlySysopsCanPatrol;
+               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 );
 
-               # If it's a new article, there is no diff link, but if it hasn't been
-               # patrolled yet, we need to give users a way to do so
-               if ( $result->usepatrol && $result->patrolled == 0 && $wgUser->getID() != 0 &&
-                    ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
+               # 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;