From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 31 Dec 2010 16:57:55 +0000 (+0000)
Subject: Merged r7272 from 1.7 to trunk.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9362768fbcdd6eb543bc53e3ad8737eb6297344d;p=lorea%2Felgg.git

Merged r7272 from 1.7 to trunk.


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

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;