From f6bb3b7776b494e5fa947ab59709b8ac2aabdfc0 Mon Sep 17 00:00:00 2001 From: petko Date: Thu, 22 Feb 2024 14:53:25 +0000 Subject: $EnableUploadVersions = 2 (cont.) git-svn-id: svn://pmwiki.org/pmwiki/trunk@4652 524c5546-5005-0410-9a3e-e25e191bd360 --- scripts/upload.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/upload.php b/scripts/upload.php index 10669085..5401b722 100644 --- a/scripts/upload.php +++ b/scripts/upload.php @@ -376,8 +376,10 @@ function UploadVerifyBasic($pagename,$uploadfile,&$filepath,&$upname=null) { } } if (IsEnabled($EnableUploadVersions, 0)==2 && file_exists($filepath)) { - if(preg_match('!^(.*)(\\.[a-z0-9]+)$!i', $filepath, $m)) { - $filepath = $m[1] . '-' . base_convert($Now, 10, 36) . $m[2]; + if(preg_match('!^(.*/([^/]+))(\\.[a-z0-9]+)$!i', $filepath, $m)) { + $stamp36 = base_convert($Now, 10, 36); + $filepath = "{$m[1]}-$stamp36{$m[3]}"; + $upname = "{$m[2]}-$stamp36{$m[3]}"; } } if (!$EnableUploadOverwrite && file_exists($filepath)) -- cgit v1.2.3