summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato.botelho@bluepex.com>2010-07-12 13:05:34 -0300
committerRenato Botelho <renato.botelho@bluepex.com>2010-07-12 13:05:34 -0300
commitfac01cc5a90c1c8a4168e3115c480fabebb56373 (patch)
tree9f2c7285034f14851eb8a76de690aa4af3c1bef2
parent05afefa06bbc3d98dfbb805b595d432f8c276cb6 (diff)
parenta803793fe5086d6bfb80d42035b6f99ed4ef01f7 (diff)
downloadpfsense-fac01cc5a90c1c8a4168e3115c480fabebb56373.zip
pfsense-fac01cc5a90c1c8a4168e3115c480fabebb56373.tar.gz
Merge remote branch 'mainline/master' into 2_firewall
-rw-r--r--usr/local/www/system_usermanager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index f89d834..3477721 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -319,10 +319,10 @@ if (isAllowedPage("system_usermanager")) {
}
$userent['uid'] = $config['system']['nextuid']++;
/* Add the user to All Users group. */
- if (!is_array($config['system']['group']['member']))
- $config['system']['group']['member'] = array();
foreach ($config['system']['group'] as $gidx => $group) {
if ($group['name'] == "all") {
+ if (!is_array($config['system']['group'][$gidx]['member']))
+ $config['system']['group'][$gidx]['member'] = array();
$config['system']['group'][$gidx]['member'][] = $userent['uid'];
break;
}
OpenPOWER on IntegriCloud