From: Rob Church Date: Sat, 29 Apr 2006 01:58:39 +0000 (+0000) Subject: (bug 5741) Introduce {{NUMBEROFUSERS}} magic word X-Git-Tag: 1.31.0-rc.0~57342 X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=b99de7897eeaf78186f4cbe6337b89ce3659d210;p=lhc%2Fweb%2Fwiklou.git (bug 5741) Introduce {{NUMBEROFUSERS}} magic word --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ba9699d6c1..e51be3c4a6 100644 --- 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 8351b2a141..54f4b0adb6 100644 --- 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 4df56e0db1..68ef1a3fcc 100644 --- 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 32441a8542..74b1efffa8 100644 --- 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' ),