diff options
| author | cash <cash.costello@gmail.com> | 2013-05-02 22:02:41 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2013-05-02 22:02:41 -0400 |
| commit | d785357ba7cb9e8a6bb7b2f91bf389e6bd1e636b (patch) | |
| tree | 3e0b3f8633aeffa61220e2ba3cfaffd9b6e1c2c1 /engine/lib/metastrings.php | |
| parent | 0726860ca04b4f2ed9b010cc5c5692c23c32e2d2 (diff) | |
| download | elgg-d785357ba7cb9e8a6bb7b2f91bf389e6bd1e636b.tar.gz elgg-d785357ba7cb9e8a6bb7b2f91bf389e6bd1e636b.tar.bz2 | |
Fixes #5418 adds enabled clause for annotations
Diffstat (limited to 'engine/lib/metastrings.php')
| -rw-r--r-- | engine/lib/metastrings.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php index f49b4a163..39a81c6d0 100644 --- a/engine/lib/metastrings.php +++ b/engine/lib/metastrings.php @@ -421,6 +421,8 @@ function elgg_get_metastring_based_objects($options) { if ($metastring_clauses) { $wheres = array_merge($wheres, $metastring_clauses['wheres']); $joins = array_merge($joins, $metastring_clauses['joins']); + } else { + $wheres[] = get_access_sql_suffix('n_table'); } if ($options['metastring_calculation'] === ELGG_ENTITIES_NO_VALUE) { @@ -510,7 +512,7 @@ function elgg_get_metastring_sql($table, $names = null, $values = null, && !$ids && (!$pairs && $pairs !== 0)) { - return ''; + return array(); } $db_prefix = elgg_get_config('dbprefix'); @@ -520,8 +522,6 @@ function elgg_get_metastring_sql($table, $names = null, $values = null, // only supported on values. $binary = ($case_sensitive) ? ' BINARY ' : ''; - $access = get_access_sql_suffix($table); - $return = array ( 'joins' => array (), 'wheres' => array() @@ -586,13 +586,15 @@ function elgg_get_metastring_sql($table, $names = null, $values = null, } if ($names_where && $values_where) { - $wheres[] = "($names_where AND $values_where AND $access)"; + $wheres[] = "($names_where AND $values_where)"; } elseif ($names_where) { - $wheres[] = "($names_where AND $access)"; + $wheres[] = $names_where; } elseif ($values_where) { - $wheres[] = "($values_where AND $access)"; + $wheres[] = $values_where; } + $wheres[] = get_access_sql_suffix($table); + if ($where = implode(' AND ', $wheres)) { $return['wheres'][] = "($where)"; } |