aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-08 05:44:02 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-08 05:44:02 +0000
commit8d976d6e60bc73a8fe5550b3798afdb6bf54b72a (patch)
treee7d55911da475691d0f5c6f4df2aa89472b25ac5
parentb134971a7b2dc7b4cf77057a4b39285dbb6edda7 (diff)
downloadelgg-8d976d6e60bc73a8fe5550b3798afdb6bf54b72a.tar.gz
elgg-8d976d6e60bc73a8fe5550b3798afdb6bf54b72a.tar.bz2
Fixes #2310. Only conditionally setting the allow_registration field for users who used $CONFIG->disable_registration.
git-svn-id: http://code.elgg.org/elgg/trunk@8631 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/upgrades/2010050701.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/engine/lib/upgrades/2010050701.php b/engine/lib/upgrades/2010050701.php
index e327abdde..b92d6a668 100644
--- a/engine/lib/upgrades/2010050701.php
+++ b/engine/lib/upgrades/2010050701.php
@@ -14,8 +14,11 @@ if (elgg_is_active_plugin('walledgarden')) {
set_config('walled_garden', FALSE);
}
+// this was for people who manually set the config option
$disable_registration = elgg_get_config('disable_registration');
-$allow_registration = !$disable_registration;
-elgg_save_config('allow_registration', $allow_registration);
+if ($disable_registration !== null) {
+ $allow_registration = !$disable_registration;
+ elgg_save_config('allow_registration', $allow_registration);
+}
elgg_set_ignore_access($access);