From be4eef682ae515fd542ec351eef05cc54fe3247c Mon Sep 17 00:00:00 2001
From: infoneo <infoneo@yahoo.pl>
Date: Sun, 12 May 2013 15:22:57 +0300
Subject: [PATCH] Fixed problems with a dots in a filenames
---
lib/files/mapper.php | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/lib/files/mapper.php b/lib/files/mapper.php
index 97a2bff915..d9e116bf25 100644
--- a/lib/files/mapper.php
+++ b/lib/files/mapper.php
@@ -176,16 +176,22 @@ class Mapper
$last= end($pathElements);
$parts = pathinfo($last);
- if ((preg_match('~[-\w]+~', $parts['filename'])) && (preg_match('~[-\w]+~', $parts['extension']))){
+ $filename = $parts['filename'];
+ $extension = $parts['extension'];
+
+
+ if ((preg_match('~[-\w]+~', $filename)) && (preg_match('~[-\w]+~', $extension))){
- // rip off the extension ext from last element
- $filename = $parts['filename'];
- array_pop($pathElements);
- array_push($pathElements, $filename);
+ // rip off the extension ext from last element
+ array_pop($pathElements);
+ array_push($pathElements, $filename);
} else {
- unset($parts['extension']);
+ if (isset($parts['extension'])) {
+ unset($parts['extension']);
+ }
+
}
foreach ($pathElements as $pathElement) {
--
GitLab