aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-10-02 22:59:03 +0000
committerz0rglub <z0rglub@piwigo.org>2004-10-02 22:59:03 +0000
commitda836ea95fce9a8b5711366253832d298e3c4a6e (patch)
tree827499d616887d99b7e9c088900caf242216b521 /admin
parent28dcfea993edd4e4ff9eb06e49ec6b2ef326396d (diff)
directories "high" and "representative" are not returned anymore as
potential category directories git-svn-id: http://piwigo.org/svn/trunk@540 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/create_listing_file.php6
-rw-r--r--admin/include/functions.php11
2 files changed, 11 insertions, 6 deletions
diff --git a/admin/create_listing_file.php b/admin/create_listing_file.php
index 33da67170..48108afc8 100644
--- a/admin/create_listing_file.php
+++ b/admin/create_listing_file.php
@@ -258,8 +258,10 @@ function get_dirs($basedir, $indent, $level)
{
if ($file != '.'
and $file != '..'
- and is_dir ($basedir.'/'.$file)
- and $file != 'thumbnail')
+ and $file != 'thumbnail'
+ and $file != 'high'
+ and $file != 'representative'
+ and is_dir ($basedir.'/'.$file))
{
array_push($fs_dirs, $file);
if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $file))
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 002c1747a..3feebdb22 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -740,7 +740,7 @@ function is_user_allowed( $category_id, $restrictions )
/**
* returns an array containing sub-directories which can be a category
*
- * directories nammed "thumbnail" are omitted
+ * directories nammed "thumbnail", "high" or "representative" are omitted
*
* @param string $basedir
* @return array
@@ -753,9 +753,12 @@ function get_category_directories( $basedir )
{
while ( $file = readdir( $opendir ) )
{
- if ( $file != '.' and $file != '..'
- and is_dir( $basedir.'/'.$file )
- and $file != 'thumbnail' )
+ if ($file != '.'
+ and $file != '..'
+ and $file != 'thumbnail'
+ and $file != 'high'
+ and $file != 'representative'
+ and is_dir($basedir.'/'.$file))
{
array_push( $sub_dirs, $file );
}