aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-12-01 20:09:11 -0500
committerSteve Clay <steve@mrclay.org>2012-12-01 22:21:53 -0500
commit9168cf7df39e404516c45f77bd64b47b3c61c75d (patch)
tree1ea3f7a999d4c33b2780b06ada411a82b74f9c99
parent2f8d91ca5f506624773d96937779be449ca89aa0 (diff)
downloadelgg-9168cf7df39e404516c45f77bd64b47b3c61c75d.tar.gz
elgg-9168cf7df39e404516c45f77bd64b47b3c61c75d.tar.bz2
Make metadata prefetch respect access
-rw-r--r--engine/classes/ElggVolatileMetadataCache.php3
-rw-r--r--mod/profile/views/default/profile/details.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/engine/classes/ElggVolatileMetadataCache.php b/engine/classes/ElggVolatileMetadataCache.php
index 24ae58d42..8a33c198d 100644
--- a/engine/classes/ElggVolatileMetadataCache.php
+++ b/engine/classes/ElggVolatileMetadataCache.php
@@ -279,6 +279,9 @@ class ElggVolatileMetadataCache {
),
'selects' => array('n.string AS name', 'v.string AS value'),
'order_by' => 'n_table.entity_guid, n_table.time_created ASC',
+
+ // @todo don't know why this is necessary
+ 'wheres' => array(get_access_sql_suffix('n_table')),
);
$data = elgg_get_metadata($options);
diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php
index 3af5cb756..7b05b0e15 100644
--- a/mod/profile/views/default/profile/details.php
+++ b/mod/profile/views/default/profile/details.php
@@ -28,7 +28,7 @@ if (is_array($profile_fields) && sizeof($profile_fields) > 0) {
<div class="<?php echo $even_odd; ?>">
<b><?php echo elgg_echo("profile:{$shortname}"); ?>: </b>
<?php
- echo elgg_view("output/{$valtype}", array('value' => $user->$shortname));
+ echo elgg_view("output/{$valtype}", array('value' => $value));
?>
</div>
<?php