Merge branch 'php8'

[scuttle] / login.php

diff --git a/login.php b/login.php
index d36139473d074a0f1a3c1c427d5f1f334b3cb07f..8e59253b796793da5d04cf177294ae67c24d902c 100644 (file)
--- a/login.php
+++ b/login.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,9 +18,10 @@ 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');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
-$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
+require_once 'header.inc.php';
+$sf = new ServiceFactory();
+$userservice     =& $sf->getServiceInstance('UserService');
+$templateservice =& $sf->getServiceInstance('TemplateService');
 
 $tplVars = array();