* (bug 1949) Profiling typo in rare error case

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

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 446dc6f..37b4816 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -79,6 +79,7 @@ class QueryPage {
         * 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 '';
@@ -90,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
@@ -182,13 +193,28 @@ class QueryPage {
 
                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 );
-                               $attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
-                                                                       $obj->patrolled == 0 ) ? ' class="not_patrolled"' : '';
-                               $s .= "<li{$attr}>{$format}</li>\n";
+                               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 );
@@ -248,7 +274,7 @@ class QueryPage {
                        }
 
                        return new FeedItem(
-                               $title->getText(),
+                               $title->getPrefixedText(),
                                $this->feedItemDesc( $row ),
                                $title->getFullURL(),
                                $date,
@@ -260,18 +286,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 ) {