removed deprecated tag library calls

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

5 files changed, 48 insertions, 11 deletions

diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index d5010118a..9e81f4601 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -144,10 +144,9 @@ function elgg_get_tags(array $options = array()) {
 
 	$options = array_merge($defaults, $options);
 
-	$singulars = array('type', 'subtype', 'owner_guid', 'container_guid', 'site_guid');
+	$singulars = array('type', 'subtype', 'owner_guid', 'container_guid', 'site_guid', 'tag_name');
 	$options = elgg_normalise_plural_options_array($options, $singulars);
 
-
 	$registered_tags = elgg_get_registered_tag_metadata_names();
 
 	if (!is_array($options['tag_names'])) {
@@ -369,7 +368,7 @@ function elgg_view_tagcloud(array $options = array()) {
 function display_tagcloud($threshold = 1, $limit = 10, $metadata_name = "", $entity_type = "object",
 $entity_subtype = "", $owner_guid = "", $site_guid = -1, $start_ts = "", $end_ts = "") {
 
-	elgg_deprecated_notice('display_cloud() was deprecated by elgg_view_tagcloud()!', 1.8);
+	elgg_deprecated_notice('display_tagcloud() was deprecated by elgg_view_tagcloud()!', 1.8);
 
 	$tags = get_tags($threshold, $limit, $metadata_name, $entity_type,
 		$entity_subtype, $owner_guid, $site_guid, $start_ts, $end_ts);
@@ -433,12 +432,15 @@ register_page_handler('tags', 'elgg_tagcloud_page_handler');
  * @return void
  */
 function elgg_tagcloud_page_handler($page) {
-	global $CONFIG;
-
 	switch ($page[0]) {
 		default:
 			$title = elgg_view_title(elgg_echo('tags:site_cloud'));
-			$tags = display_tagcloud(0, 100, 'tags');
+			$options = array(
+				'threshold' => 0,
+				'limit' => 100,
+				'tag_name' => 'tags',
+			);
+			$tags = elgg_view_tagcloud($options);
 			$content = $title . $tags;
 			$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
index 120237ac5..87b0a8cf9 100644
--- a/mod/blog/views/default/blog/sidebar_menu.php
+++ b/mod/blog/views/default/blog/sidebar_menu.php
@@ -59,7 +59,22 @@ if ($page_owner) {
 
 	// friends page lists all tags; mine lists owner's
 	$owner_guid = ($vars['page'] == 'friends') ? '' : $page_owner->getGUID();
-	echo display_tagcloud(0, 50, 'tags', 'object', 'blog', $owner_guid);
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'blog',
+		'owner_guid' => $owner_guid,
+		'threshold' => 0,
+		'limit' => 50,
+		'tag_name' => 'tags',
+	);
+	echo elgg_view_tagcloud($options);
 } else {
-	echo display_tagcloud(0, 50, 'tags', 'object', 'blog');
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'blog',
+		'threshold' => 0,
+		'limit' => 50,
+		'tag_name' => 'tags',
+	);
+	echo elgg_view_tagcloud($options);
 }
diff --git a/mod/file/start.php b/mod/file/start.php
index 78790d034..10fbff27e 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -213,7 +213,15 @@
 		}
 
 		elgg_register_tag_metadata_name('simpletype');
-		$types = get_tags(0,10,'simpletype','object','file',$owner_guid);
+		$options = array(
+			'type' => 'object',
+			'subtype' => 'file',
+			'owner_guid' => $owner_guid,
+			'threshold' => 0,
+			'limit' => 10,
+			'tag_names' => array('simpletype')
+		);
+		$types = elgg_get_tags($options);
 
 		return elgg_view('file/typecloud',array('owner_guid' => $owner_guid, 'friend_guid' => $friendofguid, 'types' => $types));
 	}
diff --git a/mod/tagcloud/tagcloud.php b/mod/tagcloud/tagcloud.php
index f5554ccba..ecbfc130c 100644
--- a/mod/tagcloud/tagcloud.php
+++ b/mod/tagcloud/tagcloud.php
@@ -7,7 +7,13 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 $title = elgg_view_title(elgg_echo('tagcloud:site:title'));
-$tags = display_tagcloud(0, 100, 'tags');
+
+$options = array(
+	'threshold' => 0,
+	'limit' => 100,
+	'tag_name' => 'tags',
+);
+$tags = elgg_view_tagcloud($options);
 
 $params = array(
 	'content' => $title . $tags,
diff --git a/mod/tagcloud/views/default/widgets/tagcloud/view.php b/mod/tagcloud/views/default/widgets/tagcloud/view.php
index 662c02d97..5ed71d66a 100644
--- a/mod/tagcloud/views/default/widgets/tagcloud/view.php
+++ b/mod/tagcloud/views/default/widgets/tagcloud/view.php
@@ -5,4 +5,10 @@ if (!isset($num_items)) {
 	$num_items = 30;
 }
 
-echo display_tagcloud(1, $num_items, 'tags', '', '', elgg_get_page_owner_guid());
+$options = array(
+	'owner_guid' => elgg_get_page_owner_guid(),
+	'threshold' => 1,
+	'limit' => $num_items,
+	'tag_name' => 'tags',
+);
+echo elgg_view_tagcloud($options);