Changeset 3167 for branches/2.2/workflow/inc/engine/config.ajax.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/engine/config.ajax.inc.php (modified) (3 diffs)

branches/2.2/workflow/inc/engine/config.ajax.inc.php

@@ -170 +170 @@
                 if ($loadGroups)
                 {
-                        $memberships = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($user);
+                        $memberships = Factory::getInstance('WorkflowLDAP')->getUserGroups($user);
                         if ($user == $_SESSION['phpgw_info']['workflow']['account_id'])
                                 $_SESSION['phpgw_info']['workflow']['user_groups'] = $memberships;
@@ -196 +196 @@
                 {
                         /* get information regarding the members of the group */
-                        $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                        $ldap = &Factory::getInstance('WorkflowLDAP');
                         $members = $ldap->getGroupUsers($group);
 
@@ -256 +256 @@
         function galaxia_get_config_values($parameters=array())
         {
-                        $config = new ajax_config();
+                        $config = &Factory::getInstance('ajax_config');
                         $config->read_repository();