Refs #3241 cleaned up comments on upgrades and removed the turning off of time limit...

git-svn-id: http://code.elgg.org/elgg/trunk@8961 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/upgrades/2008100701.php b/engine/lib/upgrades/2008100701.php
index 38837f81daeab1786f0dec2e21925c0ea79e1eca..b8d4dfdbcceaae78c09d96c2c61290c210f4558a 100644 (file)
--- a/engine/lib/upgrades/2008100701.php
+++ b/engine/lib/upgrades/2008100701.php
@@ -1,7 +1,7 @@
 <?php
-       /// Activate mail plugin
-       /**
-        * Because Elgg now has a plugable account activation process we need to activate
-        * the email account activation plugin for existing installs.
-        */
-       enable_plugin('uservalidationbyemail', $CONFIG->site->guid);
+
+/**
+ * Because Elgg now has a plugable account activation process we need to activate
+ * the email account activation plugin for existing installs.
+ */
+enable_plugin('uservalidationbyemail', $CONFIG->site->guid);

diff --git a/engine/lib/upgrades/2009022701.php b/engine/lib/upgrades/2009022701.php
index 293e9fb992634534f7d41f5ecdde473f64d69ae7..54083a34d5541ba1ec5bd1d9103f4b8fcb483f5b 100644 (file)
--- a/engine/lib/upgrades/2009022701.php
+++ b/engine/lib/upgrades/2009022701.php
@@ -1,7 +1,7 @@
 <?php
-       global $CONFIG;
+global $CONFIG;
 
-       /**
-        * Disable update client since this has now been removed.
-        */
-       disable_plugin('updateclient', $CONFIG->site->guid);
+/**
+ * Disable update client since this has now been removed.
+ */
+disable_plugin('updateclient', $CONFIG->site->guid);

diff --git a/engine/lib/upgrades/2009041701.php b/engine/lib/upgrades/2009041701.php
index 2d3d612c39226f27c567ae253432330850d17e93..7b31a3bc9f8ffdb7c2794de722d9694b6ec1059a 100644 (file)
--- a/engine/lib/upgrades/2009041701.php
+++ b/engine/lib/upgrades/2009041701.php
@@ -1,9 +1,8 @@
 <?php
 
-       global $CONFIG;
+global $CONFIG;
 
-       /// Activate kses
-       /**
-        * Elgg now has kses tag filtering built as a plugin. This needs to be enabled.
-        */
-       enable_plugin('kses', $CONFIG->site->guid);
+/**
+ * Elgg now has kses tag filtering built as a plugin. This needs to be enabled.
+ */
+enable_plugin('kses', $CONFIG->site->guid);

diff --git a/engine/lib/upgrades/2009070101.php b/engine/lib/upgrades/2009070101.php
index a72d6ea959f8ab33262e3dbbfccfe19733bc7f1c..d0eae9b91134a0c3dc56bb53ae7e19b14c3e3a6b 100644 (file)
--- a/engine/lib/upgrades/2009070101.php
+++ b/engine/lib/upgrades/2009070101.php
@@ -1,10 +1,9 @@
 <?php
 
-       global $CONFIG;
+global $CONFIG;
 
-       /// Deprecate kses and activate htmlawed
-       /**
-        * Kses appears to be a dead project so we are deprecating it in favour of htmlawed.
-        */
-       disable_plugin('kses', $CONFIG->site->guid);
-       enable_plugin('htmlawed', $CONFIG->site->guid);
+/**
+ * Kses appears to be a dead project so we are deprecating it in favour of htmlawed.
+ */
+disable_plugin('kses', $CONFIG->site->guid);
+enable_plugin('htmlawed', $CONFIG->site->guid);

diff --git a/engine/lib/upgrades/2009102801.php b/engine/lib/upgrades/2009102801.php
index 8885dbb09f66356d924952e720690b81050dc7ec..cab9a68352dd20dd5a9257baaf3a85ed5e482298 100644 (file)
--- a/engine/lib/upgrades/2009102801.php
+++ b/engine/lib/upgrades/2009102801.php
@@ -1,7 +1,8 @@
 <?php
 
-// disable timeout for large sites.
-set_time_limit(0);
+/**
+ * Move user's data directories from using username to registration date
+ */
 
 /**
  * Generates a file matrix like Elgg 1.0 did
@@ -204,7 +205,7 @@ function user_file_matrix($guid) {
 
 global $DB_QUERY_CACHE, $DB_PROFILE, $ENTITY_CACHE;
 /**
-       Upgrade file locations
+ * Upgrade file locations
  */
 $users = mysql_query("SELECT guid, username
        FROM {$CONFIG->dbprefix}users_entity WHERE username != ''");

diff --git a/engine/lib/upgrades/2010033101.php b/engine/lib/upgrades/2010033101.php
index 3265f4e61be56ad72cb6241195a231b154284b85..0bffee0010ba1b8f3101f66603165a61f69ee5e3 100644 (file)
--- a/engine/lib/upgrades/2010033101.php
+++ b/engine/lib/upgrades/2010033101.php
@@ -1,5 +1,6 @@
 <?php
-/*
+
+/**
  * Conditional upgrade for UTF8 as described in http://trac.elgg.org/ticket/1928
  */
 

diff --git a/engine/lib/upgrades/2010040201.php b/engine/lib/upgrades/2010040201.php
index 92c7d6a5c234353ce8d8e686c654f732b10b9b5d..789bf5dfc7db6d8c7010d9f9b48255775fce4c00 100644 (file)
--- a/engine/lib/upgrades/2010040201.php
+++ b/engine/lib/upgrades/2010040201.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Pull admin metadata setting into users_entity table column
  */

diff --git a/engine/lib/upgrades/2010061501.php b/engine/lib/upgrades/2010061501.php
index 550489e4d890b2bc0fd29811f62b08d9161877d2..9ff7d31025dea579fba944a2b3c6629ec446ccc3 100644 (file)
--- a/engine/lib/upgrades/2010061501.php
+++ b/engine/lib/upgrades/2010061501.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * utf8 conversion and file merging for usernames with multibyte chars
+ * utf8 database conversion and file merging for usernames with multibyte chars
  *
  */
 
 
 // check that we need to do the utf8 conversion
 // C&P logic from 2010033101
-set_time_limit(0);
 $dbversion = (int) datalist_get('version');
 
 if ($dbversion < 2009100701) {