Merge branch 'php8'

[scuttle] / alltags.php

diff --git a/alltags.php b/alltags.php
index b7844146085d8fc499ee74dd536a112d23904637..8423872f43b9ab4a231d6ed23747bf89adb7e17a 100644 (file)
--- a/alltags.php
+++ b/alltags.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,13 +18,15 @@ 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';
 
-list($url, $user) = explode('/', $_SERVER['PATH_INFO']);
+$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']);
 if (!$user) {
     header('Location: '. createURL('populartags'));
     exit;