Updated documentation for elgg_get_entity_metadata_where_sql()

git-svn-id: http://code.elgg.org/elgg/trunk@3596 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 24820316241ee8294c9a03ea508c1e800e7d67b5..bbdd3365ae61af6535a2fa39530aeb37932f786d 100644 (file)
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -584,10 +584,6 @@ function elgg_get_entities_from_metadata(array $options = array()) {
        $singulars = array('name', 'value', 'name_value_pair');
        $options = elgg_normalise_plural_options_array($options, $singulars);
 
-       if (!is_array($options['wheres'])) {
-               $options['wheres'] = array();
-       }
-
        $clauses = elgg_get_entity_metadata_where_sql('e', $options['names'], $options['values'],
                $options['name_value_pairs'], $options['name_value_pairs_operator'], $options['case_sensitive']);
 
@@ -617,8 +613,12 @@ function elgg_get_entities_from_metadata(array $options = array()) {
  * nb: $names and $values are not paired. Use $pairs for this.
  * Pairs default to '=' operand.
  *
- * @param $names
- * @param $values
+ * @param $prefix
+ * @param ARR|NULL $names
+ * @param ARR|NULL $values
+ * @param ARR|NULL $pairs array of names / values / operands
+ * @param AND|OR $pair_operator Operator to use to join the where clauses for pairs
+ * @param BOOL $case_sensitive
  * @return FALSE|array False on fail, array('joins', 'wheres')
  */
 function elgg_get_entity_metadata_where_sql($prefix, $names = NULL, $values = NULL, $pairs = NULL, $pair_operator = 'AND', $case_sensitive = TRUE) {