From 8ba402da459956a29e47df6598fe778cfea0f8d3 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 9 Apr 2011 13:31:59 +0000
Subject: Refs #3241 cleaned up upgrade sequence so that we don't need special
 catch for that one upgrade created during 1.7 development. It doesn't hurt
 running it twice so sites currently using svn trunk will not be negatively
 affected.

git-svn-id: http://code.elgg.org/elgg/trunk@8964 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/upgrades/2010050701.php                 | 24 -------------------
 ..._svn-goodbye_walled_garden-083121a656d06894.php | 27 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 engine/lib/upgrades/2010050701.php
 create mode 100644 engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php

(limited to 'engine/lib/upgrades')

diff --git a/engine/lib/upgrades/2010050701.php b/engine/lib/upgrades/2010050701.php
deleted file mode 100644
index b92d6a668..000000000
--- a/engine/lib/upgrades/2010050701.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Removes the Walled Garden plugin in favor of new system settings
- */
-
-$access = elgg_set_ignore_access(TRUE);
-
-if (elgg_is_active_plugin('walledgarden')) {
-	disable_plugin('walledgarden');
-	set_config('allow_registration', FALSE);
-	set_config('walled_garden', TRUE);
-} else {
-	set_config('allow_registration', TRUE);
-	set_config('walled_garden', FALSE);
-}
-
-// this was for people who manually set the config option
-$disable_registration = elgg_get_config('disable_registration');
-if ($disable_registration !== null) {
-	$allow_registration = !$disable_registration;
-	elgg_save_config('allow_registration', $allow_registration);
-}
-
-elgg_set_ignore_access($access);
diff --git a/engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php b/engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php
new file mode 100644
index 000000000..5f98ef535
--- /dev/null
+++ b/engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011021800
+ * goodbye_walled_garden
+ *
+ * Removes the Walled Garden plugin in favor of new system settings
+ */
+
+$access = elgg_set_ignore_access(TRUE);
+
+if (elgg_is_active_plugin('walledgarden')) {
+	disable_plugin('walledgarden');
+	set_config('allow_registration', FALSE);
+	set_config('walled_garden', TRUE);
+} else {
+	set_config('allow_registration', TRUE);
+	set_config('walled_garden', FALSE);
+}
+
+// this was for people who manually set the config option
+$disable_registration = elgg_get_config('disable_registration');
+if ($disable_registration !== null) {
+	$allow_registration = !$disable_registration;
+	elgg_save_config('allow_registration', $allow_registration);
+}
+
+elgg_set_ignore_access($access);
-- 
cgit v1.2.3