8 files changed, 15 insertions, 18 deletions
diff --git a/templates/dynamictags.inc.php b/templates/dynamictags.inc.php
index 5a85143..4bc0421 100644
--- a/templates/dynamictags.inc.php
+++ b/templates/dynamictags.inc.php
@@ -19,13 +19,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-$tagservice = & ServiceFactory :: getServiceInstance('TagService');
+$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
 $userservice = & ServiceFactory :: getServiceInstance('UserService');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 
-$userPopularTags        =& $tagservice->getPopularTags($logged_on_userid, 25, $logged_on_userid);
-$userPopularTagsCloud   =& $tagservice->tagCloud($userPopularTags, 5, 90, 175); 
+$userPopularTags        =& $b2tservice->getPopularTags($logged_on_userid, 25, $logged_on_userid);
+$userPopularTagsCloud   =& $b2tservice->tagCloud($userPopularTags, 5, 90, 175); 
 $userPopularTagsCount   = count($userPopularTags);
 
 if ($userPopularTagsCount > 0) {
@@ -117,4 +117,4 @@ document.write('<\/div>');
 
 <?php
 }
-?>
-\ No newline at end of file
+?>
diff --git a/templates/sidebar.block.common.php b/templates/sidebar.block.common.php
index e92efa7..dd3ce18 100644
--- a/templates/sidebar.block.common.php
+++ b/templates/sidebar.block.common.php
@@ -1,7 +1,7 @@
 <?php
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
-$commonTags =& $tagservice->getRelatedTagsByHash($hash);
-$commonTags =& $tagservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); 
+$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$commonTags =& $b2tservice->getRelatedTagsByHash($hash);
+$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); 
 
 if ($commonTags && count($commonTags) > 0) {
 ?>
diff --git a/templates/sidebar.block.popular.php b/templates/sidebar.block.popular.php
index 446e9b2..cc5c73a 100644
--- a/templates/sidebar.block.popular.php
+++ b/templates/sidebar.block.popular.php
@@ -1,13 +1,13 @@
 <?php
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
+$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 if ($logged_on_userid === false) {
     $logged_on_userid = NULL;
 }
-$popularTags =& $tagservice->getPopularTags($userid, $popCount, $logged_on_userid);
-$popularTags =& $tagservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); 
+$popularTags =& $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid);
+$popularTags =& $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); 
 
 if ($popularTags && count($popularTags) > 0) {
 ?>
diff --git a/templates/sidebar.block.recent.php b/templates/sidebar.block.recent.php
index 58a9f84..6d25478 100644
--- a/templates/sidebar.block.recent.php
+++ b/templates/sidebar.block.recent.php
@@ -1,13 +1,13 @@
 <?php
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
+$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 $logged_on_userid = $userservice->getCurrentUserId();
 if ($logged_on_userid === false) {
     $logged_on_userid = NULL;
 }
-$recentTags = $tagservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']);
-$recentTags =& $tagservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); 
+$recentTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']);
+$recentTags =& $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); 
 
 if ($recentTags && count($recentTags) > 0) {
 ?>
diff --git a/templates/sidebar.block.related.php b/templates/sidebar.block.related.php
index fd305a6..380c789 100644
--- a/templates/sidebar.block.related.php
+++ b/templates/sidebar.block.related.php
@@ -1,5 +1,5 @@
 <?php
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
+$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 $logged_on_userid = $userservice->getCurrentUserId();
@@ -10,7 +10,7 @@ if(strlen($user)==0) {
     $cat_url = createURL('tags', '%2$s');
 }
 if ($currenttag) {
-    $relatedTags = $tagservice->getRelatedTags($currenttag, $userid, $logged_on_userid);
+    $relatedTags = $b2tservice->getRelatedTags($currenttag, $userid, $logged_on_userid);
     if (sizeof($relatedTags) > 0) {
 ?>
 
diff --git a/templates/sidebar.block.search.php b/templates/sidebar.block.search.php
index e9638d2..8b00bb4 100644
--- a/templates/sidebar.block.search.php
+++ b/templates/sidebar.block.search.php
@@ -1,5 +1,4 @@
 <?php
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 $searchhistoryservice =& ServiceFactory::getServiceInstance('SearchHistoryService');
 
diff --git a/templates/sidebar.block.tagactions.php b/templates/sidebar.block.tagactions.php
index 907a61d..43d4922 100644
--- a/templates/sidebar.block.tagactions.php
+++ b/templates/sidebar.block.tagactions.php
@@ -1,6 +1,5 @@
 <?php
 $userservice =& ServiceFactory::getServiceInstance('UserService');
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
 
 if ($userservice->isLoggedOn()) {
     $currentUser = $userservice->getCurrentUser();
diff --git a/templates/sidebar.block.users.php b/templates/sidebar.block.users.php
index b2d5b4e..813c163 100644
--- a/templates/sidebar.block.users.php
+++ b/templates/sidebar.block.users.php
@@ -1,5 +1,4 @@
 <?php
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 $logged_on_userid = $userservice->getCurrentUserId();