aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/upgrades/2010061501.php
diff options
context:
space:
mode:
Diffstat (limited to 'engine/lib/upgrades/2010061501.php')
-rw-r--r--engine/lib/upgrades/2010061501.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/lib/upgrades/2010061501.php b/engine/lib/upgrades/2010061501.php
index d230236fc..744c28fd5 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) {
@@ -46,7 +45,7 @@ if ($dbversion < 2009100701) {
}
}
- global $DB_QUERY_CACHE, $DB_PROFILE, $ENTITY_CACHE;
+ global $ENTITY_CACHE;
/**
Upgrade file locations
@@ -61,7 +60,9 @@ if ($dbversion < 2009100701) {
$users = mysql_query("SELECT guid, username FROM {$CONFIG->dbprefix}users_entity
WHERE username != ''", $link);
while ($user = mysql_fetch_object($users)) {
- $DB_QUERY_CACHE = $DB_PROFILE = $ENTITY_CACHE = array();
+ $ENTITY_CACHE = array();
+ _elgg_invalidate_query_cache();
+
$to = $CONFIG->dataroot . user_file_matrix($user->guid);
foreach (array('1_0', '1_1', '1_6') as $version) {
@@ -71,4 +72,4 @@ if ($dbversion < 2009100701) {
}
}
}
-} \ No newline at end of file
+}