aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-31 16:57:55 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-31 16:57:55 +0000
commit9362768fbcdd6eb543bc53e3ad8737eb6297344d (patch)
treec774735990ce928a01fb1def3354cd08a5a93897 /engine
parentcc8554abadc047469087fcd4f8f469ba733fceb0 (diff)
downloadelgg-9362768fbcdd6eb543bc53e3ad8737eb6297344d.tar.gz
elgg-9362768fbcdd6eb543bc53e3ad8737eb6297344d.tar.bz2
Merged r7272 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@7791 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/metadata.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 12c8a74af..f2b1fd642 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -329,7 +329,7 @@ function delete_metadata($id) {
* @param int $entity_guid Entity GUID
* @param string $meta_name Metadata name
*
- * @return mixed Either an ElggMetadata object, an array of ElggMetadata or false.
+ * @return mixed ElggMetadata object, an array of ElggMetadata or false.
*/
function get_metadata_byname($entity_guid, $meta_name) {
global $CONFIG;