Changeset 3167 for branches/2.2/workflow/inc/class.CachedLDAP.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.CachedLDAP.inc.php (modified) (2 diffs)

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

@@ -97 +97 @@
 
                 /* load the information and establish a connection */
-                $tmpLDAP = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $tmpLDAP =& Factory::getInstance('WorkflowLDAP');
                 $this->userContext  = $tmpLDAP->getUserContext();
                 $this->groupContext = $tmpLDAP->getGroupContext();
-                $this->dataSource = &$GLOBALS['workflow']['workflowObjects']->getLDAP();
+                $this->dataSource =& Factory::getInstance('WorkflowObjects')->getLDAP();
         }
 
@@ -115 +115 @@
 
                 /* establish a connection */
-                $this->DBLink = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;
+                $this->DBLink =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
         }