From cd536030453e7390573d16bca824e6edd8d0bfa4 Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 6 Oct 2008 14:29:26 +0000 Subject: Minor fix for previous. git-svn-id: https://code.elgg.org/elgg/trunk@2187 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 4c98c84c4..2ccf87154 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -312,10 +312,10 @@ if (file_exists($dir) && is_dir($dir)) { if ($handle = opendir($dir)) { while ($view = readdir($handle)) { - if (!in_array($view, array('.','..'))) { - if (is_dir($view)) { + if (!in_array($view, array('.','..','.svn','CVS'))) { + if (is_dir($dir . '/' . $view)) { if ($val = get_views($dir . '/' . $view, $base . '/' . $view)) { - array_merge($return, $val); + $return = array_merge($return, $val); } } else { $view = str_replace('.php','',$view); -- cgit v1.2.3