diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-09 12:34:38 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-09 12:34:38 +0000 |
commit | 94d316ea1f20fbca680641cc846c9ead979e7017 (patch) | |
tree | 45e8732539de7af518bb5ad761f8c191677dbfd7 | |
parent | c906e91726bbf53105234af073ce8d806cc9030f (diff) | |
download | elgg-94d316ea1f20fbca680641cc846c9ead979e7017.tar.gz elgg-94d316ea1f20fbca680641cc846c9ead979e7017.tar.bz2 |
Refs #3241 cleaned up comments on upgrades and removed the turning off of time limit in individual upgrades since this is now handled by the upgrade function
git-svn-id: http://code.elgg.org/elgg/trunk@8961 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r-- | engine/lib/upgrades/2008100701.php | 12 | ||||
-rw-r--r-- | engine/lib/upgrades/2009022701.php | 10 | ||||
-rw-r--r-- | engine/lib/upgrades/2009041701.php | 11 | ||||
-rw-r--r-- | engine/lib/upgrades/2009070101.php | 13 | ||||
-rw-r--r-- | engine/lib/upgrades/2009102801.php | 7 | ||||
-rw-r--r-- | engine/lib/upgrades/2010033101.php | 3 | ||||
-rw-r--r-- | engine/lib/upgrades/2010040201.php | 1 | ||||
-rw-r--r-- | engine/lib/upgrades/2010061501.php | 3 |
8 files changed, 30 insertions, 30 deletions
diff --git a/engine/lib/upgrades/2008100701.php b/engine/lib/upgrades/2008100701.php index 38837f81d..b8d4dfdbc 100644 --- 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 293e9fb99..54083a34d 100644 --- 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 2d3d612c3..7b31a3bc9 100644 --- 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 a72d6ea95..d0eae9b91 100644 --- 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 8885dbb09..cab9a6835 100644 --- 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 3265f4e61..0bffee001 100644 --- 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 92c7d6a5c..789bf5dfc 100644 --- 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 550489e4d..9ff7d3102 100644 --- 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) { |