don't check for isset() when variable is always initialized

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

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 027df13..8838d99 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Contain a class for special pages
+ * @package MediaWiki
  */
 
 /**
@@ -13,6 +14,7 @@ require_once ( 'Feed.php' );
  * we factor out some of the functionality into a superclass, and let
  * subclasses derive from it.
  *
+ * @package MediaWiki
  */
 class QueryPage {
 
@@ -66,10 +68,18 @@ class QueryPage {
                return $wgDisableQueryPages;
        }
 
+       /**
+        * Sometime we dont want to build rss / atom feeds.
+        */
+       function isSyndicated() {
+               return true;
+       }
+
        /**
         * Formats the results of the query for display. The skin is the current
         * skin; you can use it for making links. The result is a single row of
         * result data. You should be able to grab SQL results off of it.
+        * If the function return "false", the line output will be skipped.
         */
        function formatResult( $skin, $result ) {
                return '';
@@ -81,6 +91,16 @@ class QueryPage {
        function getPageHeader( ) {
                return '';
        }
+       
+       /**
+        * Some special pages (for example SpecialListusers) might not return the
+        * current object formatted, but return the previous one instead.
+        * Setting this to return true, will call one more time wfFormatResult to
+        * be sure that the very last result is formatted and shown.
+        */
+       function tryLastResult( ) {
+               return false;
+       }
 
        /**
         * This is the actual workhorse. It does everything needed to make a
@@ -90,7 +110,7 @@ class QueryPage {
         * @param $limit database query limit
         */
        function doQuery( $offset, $limit ) {
-               global $wgUser, $wgOut, $wgLang, $wgRequest;
+               global $wgUser, $wgOut, $wgLang, $wgRequest, $wgContLang;
                global $wgMiserMode;
 
                $sname = $this->getName();
@@ -100,7 +120,7 @@ class QueryPage {
                $dbw =& wfGetDB( DB_MASTER );
                $querycache = $dbr->tableName( 'querycache' );
 
-               $wgOut->setSyndicated( true );
+               $wgOut->setSyndicated( $this->isSyndicated() );
                $res = false;
 
                if ( $this->isExpensive() ) {
@@ -110,8 +130,9 @@ class QueryPage {
                                $dbw->delete( 'querycache', array( 'qc_type' => $sname ), $fname );
 
                                # Do query on the (possibly out of date) slave server
+                               $slowDB =& wfGetDB( DB_SLAVE, array( $this->getName(), 'QueryPage-recache', 'vslow' ) );
                                $maxstored = 1000;
-                               $res = $dbr->query( $sql . $this->getOrder() . $dbr->limitResult( $maxstored,0 ), $fname );
+                               $res = $slowDB->query( $sql . $this->getOrder() . $dbr->limitResult( $maxstored,0 ), $fname );
 
                                # Fetch results
                                $insertSql = "INSERT INTO $querycache (qc_type,qc_namespace,qc_title,qc_value) VALUES ";
@@ -168,20 +189,37 @@ class QueryPage {
                # often disable 'next' link when we reach the end
                if($num < $limit) { $atend = true; } else { $atend = false; }
 
-               $sl = wfViewPrevNext( $offset, $limit , $wgLang->specialPage( $sname ), "" ,$atend );
+               $sl = wfViewPrevNext( $offset, $limit , $wgContLang->specialPage( $sname ), "" ,$atend );
                $wgOut->addHTML( "<br />{$sl}</p>\n" );
 
-               $s = "<ol start='" . ( $offset + 1 ) . "' class='special'>";
-               # Only read at most $num rows, because $res may contain the whole 1000
-               for ( $i = 0; $i < $num && $obj = $dbr->fetchObject( $res ); $i++ ) {
-                       $format = $this->formatResult( $sk, $obj );
-                       $attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
-                                 $obj->patrolled == 0 ) ? ' class="not_patrolled"' : '';
-                       $s .= "<li{$attr}>{$format}</li>\n";
+               if ( $num > 0 ) {
+                       $s = "<ol start='" . ( $offset + 1 ) . "' class='special'>";
+
+                       # Only read at most $num rows, because $res may contain the whole 1000
+                       for ( $i = 0; $i < $num && $obj = $dbr->fetchObject( $res ); $i++ ) {
+                               $format = $this->formatResult( $sk, $obj );
+                               if ( $format ) {
+                                       $attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
+                                                                               $obj->patrolled == 0 ) ? ' class="not-patrolled"' : '';
+                                       $s .= "<li{$attr}>{$format}</li>\n";
+                               }
+                       }
+
+                       if($this->tryLastResult()) {
+                               // flush the very last result
+                               $obj = null;
+                               $format = $this->formatResult( $sk, $obj );
+                               if( $format ) {
+                                       $attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
+                                                                               $obj->patrolled == 0 ) ? ' class="not-patrolled"' : '';
+                                       $s .= "<li{$attr}>{$format}</li>\n";
+                               }
+                       }
+                       
+                       $dbr->freeResult( $res );
+                       $s .= '</ol>';
+                       $wgOut->addHTML( $s );
                }
-               $dbr->freeResult( $res );
-               $s .= '</ol>';
-               $wgOut->addHTML( $s );
                $wgOut->addHTML( "<p>{$sl}</p>\n" );
        }
 
@@ -237,7 +275,7 @@ class QueryPage {
                        }
 
                        return new FeedItem(
-                               $title->getText(),
+                               $title->getPrefixedText(),
                                $this->feedItemDesc( $row ),
                                $title->getFullURL(),
                                $date,
@@ -249,18 +287,9 @@ class QueryPage {
        }
 
        function feedItemDesc( $row ) {
-               $text = '';
-               if( isset( $row->comment ) ) {
-                       $text = htmlspecialchars( $row->comment );
-               } else {
-                       $text = '';
-               }
-
-               if( isset( $row->text ) ) {
-                       $text = '<p>' . htmlspecialchars( wfMsg( 'summary' ) ) . ': ' . $text . "</p>\n<hr />\n<div>" .
-                               nl2br( htmlspecialchars( $row->text ) ) . "</div>";;
-               }
-               return $text;
+               return isset( $row->comment )
+                       ? htmlspecialchars( $row->comment )
+                       : '';
        }
 
        function feedItemAuthor( $row ) {
@@ -293,12 +322,15 @@ class QueryPage {
  * This is a subclass for very simple queries that are just looking for page
  * titles that match some criteria. It formats each result item as a link to
  * that page.
+ *
+ * @package MediaWiki
  */
 class PageQueryPage extends QueryPage {
 
        function formatResult( $skin, $result ) {
+               global $wgContLang;
                $nt = Title::makeTitle( $result->namespace, $result->title );
-               return $skin->makeKnownLinkObj( $nt, '' );
+               return $skin->makeKnownLinkObj( $nt, $wgContLang->convert( $result->title ) );
        }
 }