(bug 5741) Introduce {{NUMBEROFUSERS}} magic word

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ba9699d..e51be3c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -135,6 +135,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Remove unneeded extra whitespace at top of Special:Categories
 * (bug 5679): format number on timeanddate() calls for fa: hi: bn:.
 * (bug 5751) Updates to Portuguese localisation files
+* (bug 5741) Introduce {{NUMBEROFUSERS}} magic word
 
 == Compatibility ==
 

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 8351b2a..54f4b0a 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -81,6 +81,7 @@ $magicWords = array(
        'MAG_TALKPAGENAMEE',
        'MAG_SUBJECTPAGENAME',
        'MAG_SUBJECTPAGENAMEE', 
+       'MAG_NUMBEROFUSERS',
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
        wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
@@ -124,6 +125,7 @@ $wgVariableIDs = array(
        MAG_TALKPAGENAMEE,
        MAG_SUBJECTPAGENAME,
        MAG_SUBJECTPAGENAMEE,
+       MAG_NUMBEROFUSERS,
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
        wfRunHooks( 'MagicWordwgVariableIDs', array( &$wgVariableIDs ) );

diff --git a/includes/Parser.php b/includes/Parser.php
index 4df56e0..68ef1a3 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2148,6 +2148,8 @@ class Parser
                                return $varCache[$index] = $wgContLang->formatNum( wfNumberOfArticles() );
                        case MAG_NUMBEROFFILES:
                                return $varCache[$index] = $wgContLang->formatNum( wfNumberOfFiles() );
+                       case MAG_NUMBEROFUSERS:
+                               return $varCache[$index] = $wgContLang->formatNum( wfNumberOfUsers() );
                        case MAG_SITENAME:
                                return $wgSitename;
                        case MAG_SERVER:
@@ -4253,6 +4255,18 @@ function wfNumberOfFiles() {
        return $numImages;
 }
 
+/**
+ * Return the number of user accounts
+ * @return integer
+ */
+function wfNumberOfUsers() {
+       wfProfileIn( 'wfNumberOfUsers' );
+       $dbr =& wfGetDB( DB_SLAVE );
+       $count = $dbr->selectField( 'site_stats', 'ss_users', array(), 'wfNumberOfUsers' );
+       wfProfileOut( 'wfNumberOfUsers' );
+       return (int)$count;
+}
+
 /**
  * Get various statistics from the database
  * @private

diff --git a/languages/Language.php b/languages/Language.php
index 32441a8..74b1eff 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -228,6 +228,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_CURRENTTIME          => array( 1,    'CURRENTTIME'            ),
        MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES'       ),
        MAG_NUMBEROFFILES        => array( 1,    'NUMBEROFFILES'          ),
+       MAG_NUMBEROFUSERS                => array( 1,    'NUMBEROFUSERS'                  ),
        MAG_PAGENAME             => array( 1,    'PAGENAME'               ),
        MAG_PAGENAMEE            => array( 1,    'PAGENAMEE'              ),
        MAG_NAMESPACE            => array( 1,    'NAMESPACE'              ),