umask will be set anytime there is an explicit sql config other than horde's base...
authorMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 3 Nov 2010 05:23:14 +0000 (01:23 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 3 Nov 2010 05:23:14 +0000 (01:23 -0400)
framework/Core/lib/Horde/Core/Factory/Db.php

index 263639f..9924590 100644 (file)
@@ -86,8 +86,7 @@ class Horde_Core_Factory_Db
         }
 
         // Prevent DSN from getting polluted
-        if ($type == 'auth' && !empty($config['driver']) &&
-            $config['driver'] == 'customsql') {
+        if (!is_array($type) && $type == 'auth') {
             unset($config['query_auth'],
                   $config['query_add'],
                   $config['query_getpw'],
@@ -99,6 +98,8 @@ class Horde_Core_Factory_Db
                   $config['encryption'],
                   $config['show_encryption']);
         }
+        unset($config['umask']);
+
         try {
             $this->_instances[$sig] = $this->_createDb($config);
         } catch (Horde_Exception $e) {