4 files changed, 10 insertions, 30 deletions

diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index bc7287a5..28c0c57b 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -52,7 +52,7 @@ $title		= scrub_out($album->name) . ' (' . $album->year . ')' . $disk .'&nb
 	<ul>
 	<li>Tags:
 	<?php
-	$tags = TagCloud::get_tags('album', array($album->id));
+	$tags = Tag::get_object_tags('album',$album->id);
 	foreach($tags as $i)
 	  echo ($i['name']) . ' ';
 	?>
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index cbb38ce0..0cc28b58 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -18,23 +18,13 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-
-$web_path = Config::get('web_path');
-
 require Config::get('prefix') . '/templates/show_artist_box.inc.php';
-//require Config::get('prefix') . '/templates/show_artist_tagcloud.inc.php';
 ?>
 <?php
 	Browse::reset_filters(); 
 	Browse::set_type('album'); 
-	//Browse::set_filter('artist', $artist->id);
-	Browse::set_filter_from_request($_REQUEST);
-	$objs = Browse::get_objects();
-	if (sizeof($objs)) {
-	  $tagcloudHead = _('Tags for albums of') . ' ' . $artist->f_name;
-	  $taglist = TagCloud::get_tags('album', $objs);
-	  $tagcloudList = TagCloud::filter_with_prefs($taglist);
-	  require Config::get('prefix') . '/templates/show_tagcloud.inc.php';
-	}
+	Browse::set_static_content(1); 
+	Browse::save_objects($albums); 
+	$taglist = Tag::get_many_tags('album', $object_ids);
 	Browse::show_objects(); 
 ?>
diff --git a/templates/show_artist_box.inc.php b/templates/show_artist_box.inc.php
index 7968eb11..18fa687d 100644
--- a/templates/show_artist_box.inc.php
+++ b/templates/show_artist_box.inc.php
@@ -34,7 +34,7 @@ if (Config::get('ratings')) {
 <div id="information_actions">
 Tags:
 	<?php
-	$tags = TagCloud::get_tags('artist', array($artist->id));
+	$tags = Tag::get_object_tags('artist', $artist->id);
 	foreach($tags as $i)
 	  echo ($i['name']) . ' ';
 	?>
diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php
index 3d028dfb..a35ed387 100644
--- a/templates/show_tagcloud.inc.php
+++ b/templates/show_tagcloud.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All Rights Reserved
 
  This program is free software; you can redistribute it and/or
@@ -21,18 +21,8 @@
 */ 
 $web_path = Config::get('web_path'); 
 ?>
-<?php
-function rebuild_query($ar) {
-  $ret = split('?', $_SERVER['REQUEST_URI']);
-  $ret = $ret[0] . '?';
-  foreach($ar as $k=>$v)
-  {
-    $ret .= urlencode($k).'='.urlencode($v).'&';
-  }
-  return $ret;
-}
-show_box_top($tagcloudHead, 'info-box');
-//make a map id->name
+<?php show_box_top('', 'info-box'); 
+/* make a map id->name
 $tagbyid = array();
 foreach ($tagcloudList as $f)
   $tagbyid[$f['id']] = $f;
@@ -81,6 +71,6 @@ foreach ($tagcloudList as $f) {
      . 'tag='.$stags.'">'.$n.'</a> ';
    }
 }
-
+*/
 ?>
 <?php show_box_bottom(); ?>