Don't require an existence check before calling loadPageData(). Added an accessor...

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

diff --git a/includes/SpecialStatistics.php b/includes/SpecialStatistics.php
index d9acfd0..080e6d8 100644 (file)
--- a/includes/SpecialStatistics.php
+++ b/includes/SpecialStatistics.php
@@ -9,7 +9,7 @@
 * constructor
 */
 function wfSpecialStatistics() {
-       global $wgUser, $wgOut, $wgLang, $wgRequest;
+       global $wgOut, $wgLang, $wgRequest;
        $fname = 'wfSpecialStatistics';
 
        $action = $wgRequest->getVal( 'action' );
@@ -17,7 +17,7 @@ function wfSpecialStatistics() {
        $dbr =& wfGetDB( DB_SLAVE );
        extract( $dbr->tableNames( 'page', 'site_stats', 'user', 'user_groups' ) );
 
-       $row = $dbr->selectRow( 'site_stats', '*', false, 'wfSpecialStatistics' );
+       $row = $dbr->selectRow( 'site_stats', '*', false, $fname );
        $views = $row->ss_total_views;
        $edits = $row->ss_total_edits;
        $good = $row->ss_good_articles;
@@ -27,7 +27,7 @@ function wfSpecialStatistics() {
                # Update schema
                $u = new SiteStatsUpdate( 0, 0, 0 );
                $u->doUpdate();
-               $row = $dbr->selectRow( 'site_stats', '*', false, 'wfSpecialStatistics' );
+               $row = $dbr->selectRow( 'site_stats', '*', false, $fname );
        }
 
        if ( isset( $row->ss_total_pages ) ) {
@@ -46,13 +46,11 @@ function wfSpecialStatistics() {
                $res = $dbr->query( $sql, $fname );
                $userRow = $dbr->fetchObject( $res );
                $users = $userRow->total;
-       }       
+       }
+
+       $admins = $dbr->selectField( 'user_groups', 'COUNT(*)', array( 'ug_group' => 'sysop' ), $fname );
+       $numJobs = $dbr->selectField( 'job', 'COUNT(*)', '', $fname );
 
-       $sql = "SELECT COUNT(*) AS total FROM $user_groups WHERE ug_group='sysop'";
-       $res = $dbr->query( $sql, $fname );
-       $row = $dbr->fetchObject( $res );
-       $admins = $row->total;
-       
        if ($action == 'raw') {
                $wgOut->disable();
                header( 'Pragma: nocache' );
@@ -66,10 +64,12 @@ function wfSpecialStatistics() {
                        $wgLang->formatNum( $views ),
                        $wgLang->formatNum( $edits ),
                        $wgLang->formatNum( sprintf( '%.2f', $total ? $edits / $total : 0 ) ),
-                       $wgLang->formatNum( sprintf( '%.2f', $edits ? $views / $edits : 0 ) ) );
-       
+                       $wgLang->formatNum( sprintf( '%.2f', $edits ? $views / $edits : 0 ) ),
+                       $wgLang->formatNum( $numJobs )
+               );
+
                $text .= "\n==" . wfMsg( 'userstats' ) . "==\n";
-       
+
                $text .= wfMsg( 'userstatstext',
                        $wgLang->formatNum( $users ),
                        $wgLang->formatNum( $admins ),
@@ -77,7 +77,7 @@ function wfSpecialStatistics() {
                        // should logically be after #admins, danm backwards compatability!
                        $wgLang->formatNum( sprintf( '%.2f', $admins / $users * 100 ) )
                );
-               
+
                $wgOut->addWikiText( $text );
        }
 }