RELEASE-NOTES and alias NUMBEROFACTIVEUSERS for magic word ACTIVEUSERS introduced...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 43764fa..41592c2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -94,6 +94,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17311) Add a note beside the gender selection menu to tell users that
   this information will be public
 * Localize time zone regions in Special:Preferences
+* Add NUMBEROFACTIVEUSERS magic word, which is like NUMBEROFUSERS, but uses
+  the active users data from site_stats.
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c59edb9..62128bf 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -232,7 +232,7 @@ $magicWords = array(
        'numberofarticles'       => array( 1,    'NUMBEROFARTICLES'       ),
        'numberoffiles'          => array( 1,    'NUMBEROFFILES'          ),
        'numberofusers'          => array( 1,    'NUMBEROFUSERS'          ),
-       'activeusers'            => array( 1,    'ACTIVEUSERS'            ),
+       'activeusers'            => array( 1,    'ACTIVEUSERS', 'NUMBEROFACTIVEUSERS' ),
        'numberofedits'          => array( 1,    'NUMBEROFEDITS'          ),
        'numberofviews'          => array( 1,    'NUMBEROFVIEWS'          ),
        'pagename'               => array( 1,    'PAGENAME'               ),