Merge branch 'extended-cookie'

[scuttle] / services / servicefactory.php

diff --git a/services/servicefactory.php b/services/servicefactory.php
index ba2d6d7910a1ecc459d1ac09008847b0ba831f16..987d908727e8365abc6887fd3158c7364dfefa7c 100644 (file)
--- a/services/servicefactory.php
+++ b/services/servicefactory.php
@@ -1,14 +1,14 @@
 <?php
 class ServiceFactory {
-    function ServiceFactory(&$db, $serviceoverrules = array()) {    
+    function ServiceFactory(&$db, $serviceoverrules = array()) {
     }
-  
+
     function &getServiceInstance($name, $servicedir = NULL) {
         global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype;
         static $instances = array();
         static $db;
         if (!isset($db)) {
-            require_once(dirname(__FILE__) .'/../includes/db/'. $dbtype .'.php');
+            require_once dirname(__FILE__) .'/../includes/db/'. $dbtype .'.php';
             $db = new sql_db();
             $db->sql_connect($dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist);
             if(!$db->db_connect_id) {
@@ -23,11 +23,10 @@ class ServiceFactory {
                 if (!isset($servicedir)) {
                     $servicedir = dirname(__FILE__) .'/';
                 }
-                require_once($servicedir . strtolower($name) . '.php');
+                require_once $servicedir . strtolower($name) .'.php';
             }
-            $instances[$name] = call_user_func(array($name, 'getInstance'), $db);
-        }        
+            $instances[$name] = call_user_func_array(array($name, 'getInstance'), array(&$db));
+        }
         return $instances[$name];
     }
 }
-?>
\ No newline at end of file