mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Matthias Mees 2014-04-25 11:28:33 +02:00
commit 1517302940
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions_images.inc.php
View File

@ -1810,7 +1810,7 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
if ($aExcludeDirs === null) {
// add _vti_cnf to exclude possible added servers frontpage extensions
// add ckeditor/kcfinders .thumb dir to exclude, since no hook
$aExcludeDirs = array("CVS" => true, ".svn" => true, ".thumbs" => true, "_vti_cnf" => true);
$aExcludeDirs = array("CVS" => true, ".svn" => true, ".thumbs" => true, "_vti_cnf" => true, ".git" => true);
}
$odir = serendipity_dirSlash('end', $basedir) . serendipity_dirSlash('end', $dir);