|
@@ -544,26 +544,36 @@ class Database
|
|
|
}
|
|
|
|
|
|
if (isset($this->config[$path][$table])) {
|
|
|
- if (!isset($this->config[$path][$table]['info'])) {
|
|
|
- $this->config[$path][$table]['info'] = '';
|
|
|
- }
|
|
|
- if (!isset($this->config[$path][$table]['desc'])) {
|
|
|
- $this->config[$path][$table]['desc'] = '';
|
|
|
- }
|
|
|
- $manage = Dever::config('base')->manage;
|
|
|
- if ($manage) {
|
|
|
- if (isset($manage['info'])) {
|
|
|
- $this->config[$path][$table]['info'] = $manage['info'];
|
|
|
- }
|
|
|
- if (isset($manage['desc'])) {
|
|
|
- $this->config[$path][$table]['desc'] = $manage['desc'];
|
|
|
- }
|
|
|
- }
|
|
|
return $this->config[$path][$table];
|
|
|
}
|
|
|
return $this->config[$path];
|
|
|
}
|
|
|
|
|
|
+ # 得到重写的配置
|
|
|
+ public function getConfig()
|
|
|
+ {
|
|
|
+ $config = $this->config();
|
|
|
+
|
|
|
+ if (!isset($config['info'])) {
|
|
|
+ $config['info'] = '';
|
|
|
+ }
|
|
|
+ if (!isset($config['desc'])) {
|
|
|
+ $config['desc'] = '';
|
|
|
+ }
|
|
|
+
|
|
|
+ $manage = Dever::config('base')->manage;
|
|
|
+ if ($manage) {
|
|
|
+ if (isset($manage['info'])) {
|
|
|
+ $config['info'] = $manage['info'];
|
|
|
+ }
|
|
|
+ if (isset($manage['desc'])) {
|
|
|
+ $config['desc'] = $manage['desc'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return $config;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 对database配置文件进行解析
|
|
|
*
|