From 2939abbf14e5eab91ef3d3d10a0fd53c97043f2c Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 22 Apr 2007 01:40:30 +0000
Subject: added support for duplicated config file inclusion.

---
 framework/TApplication.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'framework/TApplication.php')

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;
 		}
 	}
 
-- 
cgit v1.2.3