Merged r6757:6810 from 1.7 branch into trunk

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

1 files changed, 5 insertions, 7 deletions

diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index 1d2b552ad..e73444930 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -73,7 +73,6 @@ function generate_tag_cloud(array $tags, $buckets = 6) {
  *
  * Supports similar arguments as elgg_get_entities()
  *
- * @since 1.7.1
  *
  * @param array $options Array in format:
  *
@@ -109,6 +108,7 @@ function generate_tag_cloud(array $tags, $buckets = 6) {
  *
  * @return 	false/array - if no tags or error, false
  * 			otherwise, array of objects with ->tag and ->total values
+ * @since 1.7.1
  */
 function elgg_get_tags(array $options = array()) {
 	global $CONFIG;
@@ -306,7 +306,6 @@ function get_tags($threshold = 1, $limit = 10, $metadata_name = "", $entity_type
 /**
  * Returns viewable tagcloud
  *
- * @since 1.7.1
  *
  * @see elgg_get_tags
  *
@@ -317,7 +316,7 @@ function get_tags($threshold = 1, $limit = 10, $metadata_name = "", $entity_type
  * 	subtype => must be single entity subtype
  *
  * @return string
- * 
+ * @since 1.7.1
  */
 function elgg_view_tagcloud(array $options = array()) {
 
@@ -370,10 +369,10 @@ function display_tagcloud($threshold = 1, $limit = 10, $metadata_name = "", $ent
  * This is required if you are using a non-standard metadata name
  * for your tags.
  *
- * @since 1.7
  *
  * @param string $name
- * @return TRUE
+ * @return bool
+ * @since 1.7.0
  */
 function elgg_register_tag_metadata_name($name) {
 	global $CONFIG;
@@ -392,9 +391,8 @@ function elgg_register_tag_metadata_name($name) {
 /**
  * Returns an array of valid metadata names for tags.
  *
- * @since 1.7
- *
  * @return array
+ * @since 1.7.0
  */
 function elgg_get_registered_tag_metadata_names() {
 	global $CONFIG;