replacement of PhpWebGallery folder representative by pwg_representative and
high by pwg_high git-svn-id: http://piwigo.org/svn/trunk@563 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
bfe13288a1
commit
9b1a330905
3 changed files with 11 additions and 10 deletions
|
|
@ -229,7 +229,7 @@ function get_representative_files($dir)
|
|||
global $conf;
|
||||
|
||||
$pictures = array();
|
||||
if ($opendir = @opendir($dir.'/representative'))
|
||||
if ($opendir = @opendir($dir.'/pwg_representative'))
|
||||
{
|
||||
while ($file = readdir($opendir))
|
||||
{
|
||||
|
|
@ -259,8 +259,8 @@ function get_dirs($basedir, $indent, $level)
|
|||
if ($file != '.'
|
||||
and $file != '..'
|
||||
and $file != 'thumbnail'
|
||||
and $file != 'high'
|
||||
and $file != 'representative'
|
||||
and $file != 'pwg_high'
|
||||
and $file != 'pwg_representative'
|
||||
and is_dir ($basedir.'/'.$file))
|
||||
{
|
||||
array_push($fs_dirs, $file);
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ function get_representative_files($dir)
|
|||
global $conf;
|
||||
|
||||
$pictures = array();
|
||||
if ($opendir = @opendir($dir.'/representative'))
|
||||
if ($opendir = @opendir($dir.'/pwg_representative'))
|
||||
{
|
||||
while ($file = readdir($opendir))
|
||||
{
|
||||
|
|
@ -740,7 +740,8 @@ function is_user_allowed( $category_id, $restrictions )
|
|||
/**
|
||||
* returns an array containing sub-directories which can be a category
|
||||
*
|
||||
* directories nammed "thumbnail", "high" or "representative" are omitted
|
||||
* directories nammed "thumbnail", "pwg_high" or "pwg_representative" are
|
||||
* omitted
|
||||
*
|
||||
* @param string $basedir
|
||||
* @return array
|
||||
|
|
@ -756,8 +757,8 @@ function get_category_directories( $basedir )
|
|||
if ($file != '.'
|
||||
and $file != '..'
|
||||
and $file != 'thumbnail'
|
||||
and $file != 'high'
|
||||
and $file != 'representative'
|
||||
and $file != 'pwg_high'
|
||||
and $file != 'pwg_representative'
|
||||
and is_dir($basedir.'/'.$file))
|
||||
{
|
||||
array_push( $sub_dirs, $file );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue