diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-04-13 14:54:20 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-04-13 14:54:20 -0700 |
| commit | 9f2fbbd9e64cece5e2f3f1d721a1157b739c85b7 (patch) | |
| tree | 5c08d5742defdd8f3a1577453c9f824930f7e92e /engine/lib/upgrade.php | |
| parent | 9b526b7867a461841e4f990d4ea7945660dac18d (diff) | |
| parent | 21c92cf39d719a913cd9e29474c04781e9cd72ef (diff) | |
| download | elgg-9f2fbbd9e64cece5e2f3f1d721a1157b739c85b7.tar.gz elgg-9f2fbbd9e64cece5e2f3f1d721a1157b739c85b7.tar.bz2 | |
Merge pull request #5355 from cash/oom2
Fixes the DB query cache out of memory issues
Diffstat (limited to 'engine/lib/upgrade.php')
| -rw-r--r-- | engine/lib/upgrade.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engine/lib/upgrade.php b/engine/lib/upgrade.php index d684af862..0cc1e64dc 100644 --- a/engine/lib/upgrade.php +++ b/engine/lib/upgrade.php @@ -354,16 +354,12 @@ function _elgg_upgrade_unlock() { * @access private */ function _elgg_upgrade_is_locked() { - global $CONFIG, $DB_QUERY_CACHE; - + global $CONFIG; + $is_locked = count(get_data("show tables like '{$CONFIG->dbprefix}upgrade_lock'")); - - // Invalidate query cache - if ($DB_QUERY_CACHE) { - /* @var ElggStaticVariableCache $DB_QUERY_CACHE */ - $DB_QUERY_CACHE->clear(); - elgg_log("Query cache invalidated", 'NOTICE'); - } - + + // @todo why? + _elgg_invalidate_query_cache(); + return $is_locked; } |