diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-02 11:17:56 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-02 11:17:56 -0700 |
| commit | dd55b4b87cb1c89ceeb45ccf49ce648339a86041 (patch) | |
| tree | 035059f5f06a2f6595110aff7c620380b46af103 /engine/lib/metadata.php | |
| parent | bfdb9bb8a87a29038ba1ae25355684ae19678fdd (diff) | |
| parent | ad016fd1254aa03afa7c24fdb82b35faa3c5019f (diff) | |
| download | elgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.gz elgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/lib/metadata.php')
| -rw-r--r-- | engine/lib/metadata.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php index a6b1bb43a..2becc5f3c 100644 --- a/engine/lib/metadata.php +++ b/engine/lib/metadata.php @@ -366,7 +366,6 @@ function elgg_enable_metadata(array $options) { * When in doubt, use name_value_pairs. * * @see elgg_get_entities - * @see elgg_get_entities_from_annotations * * @param array $options Array in format: * @@ -398,7 +397,7 @@ function elgg_enable_metadata(array $options) { * * metadata_owner_guids => NULL|ARR guids for metadata owners * - * @return array + * @return mixed int if count is true, an array of entity objects, or false on failure * @since 1.7.0 */ function elgg_get_entities_from_metadata(array $options = array()) { |