aboutsummaryrefslogtreecommitdiffstats
path: root/includes/Group.php
diff options
context:
space:
mode:
authorTim Starling <tstarling@users.mediawiki.org>2005-05-02 02:20:46 +0000
committerTim Starling <tstarling@users.mediawiki.org>2005-05-02 02:20:46 +0000
commitc0f1429720fb7656607011b04ad67b4561ef8ee2 (patch)
tree0abb3a333243f6cc5318b758b1a4230739ed327c /includes/Group.php
parent493c8dce7f9fbfdaf217060b9dc5998ba165bee3 (diff)
downloadmediawikicore-c0f1429720fb7656607011b04ad67b4561ef8ee2.tar.gz
mediawikicore-c0f1429720fb7656607011b04ad67b4561ef8ee2.zip
Add (somewhat redundant) check for static groups to loadFromDatabase(). It's redundant because static groups will generally have dataLoaded=true, although I don't want to rely on that. Remove unnecessary breakage of command line mode.
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/8786
Diffstat (limited to 'includes/Group.php')
-rw-r--r--includes/Group.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/Group.php b/includes/Group.php
index a660583c5c9e..48cd753f7a29 100644
--- a/includes/Group.php
+++ b/includes/Group.php
@@ -39,11 +39,10 @@ class Group {
/** Load group datas from database */
function loadFromDatabase() {
- global $wgCommandLineMode;
$fname = 'Group::loadFromDatabase';
// See if it's already loaded
- if ( $this->dataLoaded || $wgCommandLineMode ) {
+ if ( $this->dataLoaded || Group::getStaticGroups() ) {
return;
}