Merge branch 'php8'

[scuttle] / populartags.php

diff --git a/populartags.php b/populartags.php
index daef205e493f964afd947e9d7a5acf42af4e10f5..37fe285ea5f0dec70ea0cb396c60baa8a3dc2a3c 100644 (file)
--- a/populartags.php
+++ b/populartags.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (C) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,11 +18,12 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
-$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+require_once 'header.inc.php';
+$sf = new ServiceFactory();
+$bookmarkservice =& $sf->getServiceInstance('BookmarkService');
+$templateservice =& $sf->getServiceInstance('TemplateService');
+$userservice     =& $sf->getServiceInstance('UserService');
+$cacheservice    =& $sf->getServiceInstance('CacheService');
 
 list($url, $user) = explode('/', $_SERVER['PATH_INFO']);