Changeset 3167 for branches/2.2/workflow/inc/class.external_bridge.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.external_bridge.inc.php (modified) (3 diffs)

branches/2.2/workflow/inc/class.external_bridge.inc.php

@@ -13 +13 @@
 require_once 'common.inc.php';
 require_once 'engine/config.egw.inc.php';
-require_once 'class.so_adminaccess.inc.php';
 
 /**
@@ -52 +51 @@
         function external_bridge()
         {
-                $this->db = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia();
-                $this->acl = new so_adminaccess($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
+                $this->db = Factory::getInstance('WorkflowObjects')->getDBGalaxia();
+                $this->acl = &Factory::getInstance('so_adminaccess', Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
         }
         /**
@@ -156 +155 @@
 
                 /* assign variables to the template */
-                $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);
+                $smarty = Factory::getInstance('workflow_smarty', false);
                 $smarty->assign('encodedForm', $encodedForm);
                 $smarty->assign('siteAddress', $this->siteAddress);