diff options
| -rw-r--r-- | include/functions_url.inc.php | 15 |
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']; } |