From 27478826035da62e1cba07833101b162558f895a Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 4 May 2006 03:02:44 +0000
Subject: Merge from 3.0 branch till 1016.

---
 framework/Web/TAssetManager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'framework/Web/TAssetManager.php')

diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index 5600c4ab..f3ebe7c3 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))
 			{
-- 
cgit v1.2.3