From 8c497fcee182447794102ad839490e2e09bc1d5d Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Fri, 13 Jul 2012 06:32:42 +0000
Subject: [PATCH] file-class filter fix

---
 e107_admin/image.php         |  3 ++-
 e107_handlers/file_class.php | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/e107_admin/image.php b/e107_admin/image.php
index 63c6402af..d5126b920 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1182,7 +1182,8 @@ class media_admin_ui extends e_admin_ui
 
 		$fl->setFileInfo('all');
 		$rejectArray = array('^\.ftpquota$','^index\.html$','^null\.txt$','\.bak$','^.tmp','.*\.xml$','^\.$','^\.\.$','^\/$','^CVS$','thumbs\.db','.*\._$','^\.htaccess$','index\.html','null\.txt');
-		$files = $fl->get_files(e_MEDIA."temp/",'',$rejectArray);
+		$fl->setFileFilter($rejectArray);
+		$files = $fl->get_files(e_MEDIA."temp/");
 		
 		e107::js('core','core/admin.js','prototype');
 
diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php
index 61c572f69..24bb7700c 100644
--- a/e107_handlers/file_class.php
+++ b/e107_handlers/file_class.php
@@ -115,6 +115,13 @@ class e_file
 		$this->finfo = $val;
 		return $this;
 	}
+	
+	
+	public function setFileFilter($filter)
+	{
+		$this->fileFilter = $filter;	
+		return $this;	
+	}
 
 	/**
 	 * Read files from given path
@@ -158,11 +165,6 @@ class e_file
 			{
 				$omit = array($omit);
 			}
-			
-			if(count($omit))
-			{
-				$this->fileFilter = $omit;	
-			}
 		}
 		
 		while (false !== ($file = readdir($handle)))