Fixed use of tiles (bug introduced in #020e0568).

Daniel-KM · Feb 17, 2019 · d4e0512 · d4e0512
1 parent 1c5fdde
commit d4e0512
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/controllers/ImageController.php b/controllers/ImageController.php
@@ -624,7 +624,7 @@ protected function _usePreTiled($file, $transform)
         $tileInfo = $helper->tileInfo($file);
         if ($tileInfo) {
             $helper = new UniversalViewer_Controller_Action_Helper_TileServer();
-            $tile = $this->tileServer($tileInfo, $transform);
+            $tile = $helper->tileServer($tileInfo, $transform);
             return $tile;
         }
     }

diff --git a/libraries/UniversalViewer/Controller/Action/Helper/TileInfo.php b/libraries/UniversalViewer/Controller/Action/Helper/TileInfo.php
@@ -85,10 +85,21 @@ public function tileInfo(File $file)
         $url = get_option('openlayerszoom_tiles_web') ?: WEB_FILES . '/zoom_tiles';
         $this->tileBaseUrl = $url;
 
-        $tilingData = $this->getTilingData($file->filename);
+        $tilingData = $this->getTilingData($this->baseFilename($file->filename));
         return $tilingData;
     }
 
+    /**
+     * Get a filepath without extension, i.e. "/path/file.ext" to "/path/file".
+     *
+     * @return string
+     */
+    protected function baseFilename($filepath)
+    {
+        $extension = pathinfo($filepath, PATHINFO_EXTENSION);
+        return strlen($extension) ? substr($filepath, 0, strrpos($filepath, '.')) : $filepath;
+    }
+
     /**
      * Check if an image is zoomed and return its main data.
      *