adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 560: merge r1561 to trunk - url issue when $conf['picture_url_style']='file' and

Browse Source 
filename is numeric or numeric followed by -

git-svn-id: http://piwigo.org/svn/trunk@1562 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-10-13 01:00:54 +00:00
parent 8a179eb5da
commit 6a3aed2057
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_url.inc.php
+7 -8
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'];
}