Changeset 3018 for branches/2.2/phpgwapi/inc/class.setup.inc.php

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/phpgwapi/inc/class.setup.inc.php (modified) (1 diff)

branches/2.2/phpgwapi/inc/class.setup.inc.php

@@ -863 +863 @@
                                 }
                                 /* Load up some configured values */
-                                $this->db->query("SELECT config_name,config_value FROM phpgw_config "
-                                        . "WHERE config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%'",__LINE__,__FILE__);
+                                $this->db->query("SELECT config_name,config_value,config_app FROM phpgw_config " 
+                                        . "WHERE config_app = 'phpgwapi' AND (config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%')",__LINE__,__FILE__); 
                                 while($this->db->next_record())
                                 {