Changeset 1561 for branches/branch-1_6/include/functions_url.inc.php

Timestamp:

Oct 13, 2006, 2:31:29 AM (18 years ago)

Author:

rvelices

Message:

bug 560: url issue when $confpicture_url_style='file' and filename is
numeric or numeric followed by -

File:

• branches/branch-1_6/include/functions_url.inc.php (modified) (1 diff)

branches/branch-1_6/include/functions_url.inc.php

@@ -214 +214 @@
       break;
     case 'file':
-      if ( isset($params['image_file'])
-           and !is_numeric($params['image_file']) )
-      {
-        $url .= get_filename_wo_extension($params['image_file']);
-      }
-      else
-      {
-        $url .= $params['image_id'];
-      }
-      break;
+      if ( isset($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;
+        }
+      }
     default:
       $url .= $params['image_id'];