Permalink
Browse files

merge r21566 from branch 2.5 to trunk

bug 2867 fixed: move get_dirs function to a function file, so that it can be used in plugin LocalFiles Editor (see r18629)



git-svn-id: http://piwigo.org/svn/trunk@21567 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
plegall committed Mar 15, 2013
1 parent 071036f commit 0c49940ad2efbc1c2ad8d8a7ae9432c10173932f
Showing with 26 additions and 26 deletions.
  1. +0 −26 admin/extend_for_templates.php
  2. +26 −0 admin/include/functions.php
@@ -113,32 +113,6 @@
$flip_templates = array_flip($eligible_templates);
-/**
- * returns an array contening sub-directories, excluding ".svn"
- *
- * @param string $dir
- * @return array
- */
-function get_dirs($directory)
-{
- $sub_dirs = array();
- if ($opendir = opendir($directory))
- {
- while ($file = readdir($opendir))
- {
- if ($file != '.'
- and $file != '..'
- and is_dir($directory.'/'.$file)
- and $file != '.svn')
- {
- array_push($sub_dirs, $file);
- }
- }
- closedir($opendir);
- }
- return $sub_dirs;
-}
-
$available_templates = array_merge(
array('N/A' => '----------'),
get_dirs(PHPWG_ROOT_PATH.'themes'));
@@ -2456,4 +2456,30 @@ function delete_element_derivatives($infos, $type='all')
}
}
}
+
+/**
+ * returns an array contening sub-directories, excluding ".svn"
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_dirs($directory)
+{
+ $sub_dirs = array();
+ if ($opendir = opendir($directory))
+ {
+ while ($file = readdir($opendir))
+ {
+ if ($file != '.'
+ and $file != '..'
+ and is_dir($directory.'/'.$file)
+ and $file != '.svn')
+ {
+ array_push($sub_dirs, $file);
+ }
+ }
+ closedir($opendir);
+ }
+ return $sub_dirs;
+}
?>

0 comments on commit 0c49940

Please sign in to comment.