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

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'];
   }