archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 560: url issue when $conf['picture_url_style']='file' and filename is

Browse source 
numeric or numeric followed by -

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1561 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2006-10-13 00:31:29 +00:00
parent ec6f50bbfb
commit 60866f64c8
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/functions_url.inc.php
View file

@ -213,16 +213,15 @@ function make_picture_url($params)
}
break;
case 'file':
if ( isset($params['image_file'])
and !is_numeric($params['image_file']) )
if ( isset($params['image_file']) )
{
$url .= get_filename_wo_extension($params['image_file']);
$fname_wo_ext = get_filename_wo_extension($params['image_file']);
if (! preg_match('/^\d+(-|$)/', $fname_wo_ext) )
{
$url .= $fname_wo_ext;
break;
}
}
else
{
$url .= $params['image_id'];
}
break;
default:
$url .= $params['image_id'];
}