diff options
Diffstat (limited to 'framework/TApplication.php')
| -rw-r--r-- | framework/TApplication.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/TApplication.php b/framework/TApplication.php index a9d907f5..2601e408 100644 --- a/framework/TApplication.php +++ b/framework/TApplication.php @@ -1310,7 +1310,10 @@ class TApplicationConfiguration extends TComponent $when=true; if(($filePath=$node->getAttribute('file'))===null) throw new TConfigurationException('appconfig_includefile_required'); - $this->_includes[$filePath]=$when; + if(isset($this->_includes[$filePath])) + $this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')'; + else + $this->_includes[$filePath]=$when; } } |