Spacing cleanup

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

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 449ec23..243f976 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -308,20 +308,18 @@ class QueryPage {
                                
                                if( $tRow ) {
                                        $updated = $wgLang->timeAndDate( $tRow->qci_timestamp, true, true );
-                                       $cacheNotice = wfMsg( 'perfcachedts', $updated );
                                        $wgOut->addMeta( 'Data-Cache-Time', $tRow->qci_timestamp );
                                        $wgOut->addInlineScript( "var dataCacheTime = '{$tRow->qci_timestamp}';" );
+                                       $wgOut->addWikiMsg( 'perfcachedts', $updated );
                                } else {
-                                       $cacheNotice = wfMsg( 'perfcached' );
+                                       $wgOut->addWikiMsg( 'perfcached' );
                                }
-       
-                               $wgOut->addWikiText( $cacheNotice );
                                
                                # If updates on this page have been disabled, let the user know
                                # that the data set won't be refreshed for now
                                global $wgDisableQueryPageUpdate;
                                if( is_array( $wgDisableQueryPageUpdate ) && in_array( $this->getName(), $wgDisableQueryPageUpdate ) ) {
-                                       $wgOut->addWikiText( wfMsg( 'querypage-no-updates' ) );
+                                       $wgOut->addWikiMsg( 'querypage-no-updates' );
                                }
                                
                        }
@@ -403,7 +401,7 @@ class QueryPage {
                                                ? ' class="not-patrolled"'
                                                : '';
                                        $html[] = $this->listoutput
-                                               ? $format
+                                               ? $line
                                                : "<li{$attr}>{$line}</li>\n";
                                }
                        }
@@ -417,7 +415,7 @@ class QueryPage {
                                                ? ' class="not-patrolled"'
                                                : '';
                                        $html[] = $this->listoutput
-                                               ? $format
+                                               ? $line
                                                : "<li{$attr}>{$line}</li>\n";
                                }
                        }
@@ -443,15 +441,20 @@ class QueryPage {
 
        /**
         * Do any necessary preprocessing of the result object.
-        * You should pass this by reference: &$db , &$res  [although probably no longer necessary in PHP5]
         */
-       function preprocessResults( &$db, &$res ) {}
+       function preprocessResults( $db, $res ) {}
 
        /**
         * Similar to above, but packaging in a syndicated feed instead of a web page
         */
        function doFeed( $class = '', $limit = 50 ) {
-               global $wgFeedClasses;
+               global $wgFeed, $wgFeedClasses;
+               
+               if ( !$wgFeed ) {
+                       global $wgOut;
+                       $wgOut->addWikiMsg( 'feed-unavailable' );
+                       return;
+               }
 
                if( isset($wgFeedClasses[$class]) ) {
                        $feed = new $wgFeedClasses[$class](
@@ -531,4 +534,4 @@ class QueryPage {
        }
 }
 
-?>
+