瀏覽代碼

fix(configuration): Use "model_options[opt]" section from "conf.php"

Alexis Toulotte 1 年之前
父節點
當前提交
46c92e7404
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      lib/Configuration.php

+ 3 - 1
lib/Configuration.php

@@ -166,7 +166,7 @@ class Configuration
                     'tbl' => null,
                     'usr' => null,
                     'pwd' => null,
-                    'opt' => array(PDO::ATTR_PERSISTENT => true),
+                    'opt' => array(),
                 );
             } elseif (
                 $section == 'model_options' && in_array(
@@ -235,6 +235,8 @@ class Configuration
                             $result = (int) $config[$section][$key];
                         } elseif (is_string($val) && !empty($config[$section][$key])) {
                             $result = (string) $config[$section][$key];
+                        } elseif (is_array($val) && is_array($config[$section][$key])) {
+                            $result = $config[$section][$key];
                         }
                     }
                     $this->_configuration[$section][$key] = $result;