summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cd81f95)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12509
7612ce4b-ef26-0410-bec9-
ea0150e637f0
* are catalogued; for identically named files, the file earlier
* in the hierarchy (closest to this template set) is used.
*
* are catalogued; for identically named files, the file earlier
* in the hierarchy (closest to this template set) is used.
*
+ * Refuses to traverse directories called ".svn"
+ *
* @param string $template_set_id The template set in which to
* search for files
* @param array $file_list The file list so far to be added
* @param string $template_set_id The template set in which to
* search for files
* @param array $file_list The file list so far to be added
$directory = $template_base_dir;
}
$directory = $template_base_dir;
}
+
+ // bail if we have been asked to traverse a Subversion directory
+ //
+ if (strpos($directory, '/.svn') === strlen($directory) - 5) return $file_list;
+
+
$files_and_dirs = list_files($directory, '', FALSE, TRUE, FALSE, TRUE);
// recurse for all the subdirectories in the template set
$files_and_dirs = list_files($directory, '', FALSE, TRUE, FALSE, TRUE);
// recurse for all the subdirectories in the template set
$return_array = array();
foreach ($css_directories as $directory) {
$return_array = array();
foreach ($css_directories as $directory) {
- // CVS directories are not wanted
+ // CVS and SVN directories are not wanted
- if (strpos($directory, '/CVS') === strlen($directory) - 4) continue;
+ if ((strpos($directory, '/CVS') === strlen($directory) - 4)
+ || (strpos($directory, '/.svn') === strlen($directory) - 5)) continue;
$pretty_name = ucwords(str_replace('_', ' ', basename($directory)));
$pretty_name = ucwords(str_replace('_', ' ', basename($directory)));