aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-06 14:29:26 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-06 14:29:26 +0000
commitcd536030453e7390573d16bca824e6edd8d0bfa4 (patch)
tree3705eceb040ac862bbce0990fa2a85e59ccb2b6f /engine
parent3f009c92127e4033cd799f73d2d7ff9d729cd5e5 (diff)
downloadelgg-cd536030453e7390573d16bca824e6edd8d0bfa4.tar.gz
elgg-cd536030453e7390573d16bca824e6edd8d0bfa4.tar.bz2
Minor fix for previous.
git-svn-id: https://code.elgg.org/elgg/trunk@2187 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/elgglib.php6
1 files changed, 3 insertions, 3 deletions
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);