aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-10-13 01:00:54 +0000
committerrvelices <rv-github@modusoptimus.com>2006-10-13 01:00:54 +0000
commit6a3aed205772d73fc5cc60bc8877592fd17ba920 (patch)
tree788565a2769e5daccbfc196e31e47f17ff1bf6d0
parent8a179eb5da255d7dc84879e5efab70dacd9e9a32 (diff)
bug 560: merge r1561 to trunk - url issue when $conf['picture_url_style']='file' and
filename is numeric or numeric followed by - git-svn-id: http://piwigo.org/svn/trunk@1562 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_url.inc.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 7d30577fa..22c91d1e6 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -213,16 +213,15 @@ function make_picture_url($params)
}
break;
case 'file':
- if ( isset($params['image_file'])
- and !is_numeric($params['image_file']) )
- {
- $url .= get_filename_wo_extension($params['image_file']);
- }
- else
+ if ( isset($params['image_file']) )
{
- $url .= $params['image_id'];
+ $fname_wo_ext = get_filename_wo_extension($params['image_file']);
+ if (! preg_match('/^\d+(-|$)/', $fname_wo_ext) )
+ {
+ $url .= $fname_wo_ext;
+ break;
+ }
}
- break;
default:
$url .= $params['image_id'];
}