Fix path lookup and version number (Fix #717 Close #718)feature/version-thumbnail

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/fileversions.php b/lib/fileversions.php
index 2ff4782..3ed43a5 100644
--- a/lib/fileversions.php
+++ b/lib/fileversions.php
@@ -71,13 +71,13 @@ class FileVersions {
      * @return array
      */
     public static function splitPathVersion($pathVersion) {
-        $pos = strrpos($pathVersion, ".v");
-        if ($pos === false) {
+        if (empty($pathVersion)) {
             return false;
         }
-        $filePath = substr($pathVersion, 0, $pos);
-        $versionId = substr($pathVersion, 2 + $pos - strlen($pathVersion));
-        return [$filePath, $versionId];
+        if (preg_match("/(.+)\.v(\d+)$/", $pathVersion, $matches)) {
+            return [$matches[1], $matches[2]];
+        }
+        return false;
     }
 
     /**
diff --git a/lib/preview.php b/lib/preview.php
index 1cbd608..fef14c8 100644
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -360,6 +360,9 @@ class Preview extends Provider {
             $relativePath = $versionFolder->getRelativePath($absolutePath);
 
             list ($filePath, $fileVersion) = FileVersions::splitPathVersion($relativePath);
+            if ($filePath === null) {
+                return [null, null, null];
+            }
 
             $sourceFile = $this->root->getUserFolder($owner->getUID())->get($filePath);