Use proper module-dependent view suffix in renderScript view helper

xemlock · Jan 3, 2019 · 547ef5b · 547ef5b
1 parent 9212407
commit 547ef5b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/library/Zefram/View/Helper/RenderScript.php b/library/Zefram/View/Helper/RenderScript.php
@@ -126,7 +126,7 @@ public function renderScript($script = null, $module = null, array $vars = null)
 
         try {
             $exception = null;
-            $result = $view->render($this->_getScriptName($script));
+            $result = $view->render($this->_getScriptName($script, $module));
 
         } catch (Exception $exception) {
             // will be re-thrown after cleanup
@@ -186,15 +186,16 @@ protected function _getViewRenderer()
      * Ensure that given script has proper suffix (file extension)
      *
      * @param  string $script
+     * @param  string $module
      * @return string
      */
-    protected function _getScriptName($script)
+    protected function _getScriptName($script, $module)
     {
         $viewRenderer = $this->_getViewRenderer();
 
         // ensure script has proper suffix (extension)
-        if (strpos($viewRenderer->getViewScriptPathSpec(), ':suffix') !== false) {
-            $suffix = '.' . ltrim($viewRenderer->getViewSuffix(), '.');
+        if (strpos($viewRenderer->getViewScriptPathSpec($module), ':suffix') !== false) {
+            $suffix = '.' . ltrim($viewRenderer->getViewSuffix($module), '.');
             if (substr($script, -strlen($suffix)) !== $suffix) {
                 $script .= $suffix;
             }