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/river.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/river.php')
| -rw-r--r-- | engine/lib/river.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index f2ec1e101..4926a85c4 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -380,10 +380,10 @@ function _elgg_prefetch_river_entities(array $river_items) { // prefetch objects and subjects $guids = array(); foreach ($river_items as $item) { - if ($item->subject_guid && !retrieve_cached_entity($item->subject_guid)) { + if ($item->subject_guid && !_elgg_retrieve_cached_entity($item->subject_guid)) { $guids[$item->subject_guid] = true; } - if ($item->object_guid && !retrieve_cached_entity($item->object_guid)) { + if ($item->object_guid && !_elgg_retrieve_cached_entity($item->object_guid)) { $guids[$item->object_guid] = true; } } @@ -402,7 +402,7 @@ function _elgg_prefetch_river_entities(array $river_items) { $guids = array(); foreach ($river_items as $item) { $object = $item->getObjectEntity(); - if ($object->container_guid && !retrieve_cached_entity($object->container_guid)) { + if ($object->container_guid && !_elgg_retrieve_cached_entity($object->container_guid)) { $guids[$object->container_guid] = true; } } |