summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxue <>2006-05-03 18:09:10 +0000
committerxue <>2006-05-03 18:09:10 +0000
commitee6dd9872aabf90d71662c4c39a33f071a8886d0 (patch)
tree2a4e5146b57da5196c9d1dc708970ab0d71df459
parent6495c05e19db5484c3accc44cd9fcb8177202176 (diff)
TAssetManager now ignores .svn directories
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/TAssetManager.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 83257db8..a9f029a5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,6 @@
Version 3.0.1 June 1, 2006
==========================
+ENH: Ticket#153 - TAssetManager now ignores .svn directories (Qiang)
ENH: added sanity check to calling event handlers (Qiang)
Version 3.0.0 May 1, 2006
diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index bfc5ef8b..deae32ff 100644
--- a/framework/Web/TAssetManager.php
+++ b/framework/Web/TAssetManager.php
@@ -213,6 +213,7 @@ class TAssetManager extends TModule
* File modification time is used to ensure the copied files are latest.
* @param string the source directory
* @param string the destination directory
+ * @todo a generic solution to ignore certain directories and files
*/
protected function copyDirectory($src,$dst)
{
@@ -221,7 +222,7 @@ class TAssetManager extends TModule
$folder=@opendir($src);
while($file=@readdir($folder))
{
- if($file==='.' || $file==='..')
+ if($file==='.' || $file==='..' || $file==='.svn')
continue;
else if(is_file($src.'/'.$file))
{