Merge pull request #2020 from fvovan/issue-2019

add 'needed' param to smarty.load
cargomedia · Dec 15, 2015 · 090ff3a · 090ff3a
2 parents b3e1c92 + 2176834
commit 090ff3a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 4 deletions.
diff --git a/library/CM/SmartyPlugins/function.load.php b/library/CM/SmartyPlugins/function.load.php
@@ -6,14 +6,20 @@ function smarty_function_load(array $params, Smarty_Internal_Template $template)
 
     $namespace = isset($params['namespace']) ? $params['namespace'] : null;
     $parse = isset($params['parse']) ? (bool) $params['parse'] : true;
+    $needed = isset($params['needed']) ? (bool) $params['needed'] : true;
 
     if ($parse) {
-        $tplPath = $render->getLayoutPath($params['file'], $namespace);
+        $tplPath = $render->getLayoutPath($params['file'], $namespace, null, null, $needed);
+        if (null === $tplPath) {
+            return '';
+        }
         $params = array_merge($template->getTemplateVars(), $params);
         return $render->fetchTemplate($tplPath, $params);
     } else {
-        $tplPath = $render->getLayoutPath($params['file'], $namespace, null, true);
-        $file = new CM_File($tplPath);
-        return $file->read();
+        $tplPath = $render->getLayoutPath($params['file'], $namespace, null, true, $needed);
+        if (null === $tplPath) {
+            return '';
+        }
+        return (new CM_File($tplPath))->read();
     }
 }
diff --git a/tests/library/CM/SmartyPlugins/function.loadTest.php b/tests/library/CM/SmartyPlugins/function.loadTest.php
@@ -0,0 +1,38 @@
+<?php
+
+require_once CM_Util::getModulePath('CM') . 'library/CM/SmartyPlugins/function.load.php';
+
+class smarty_function_loadTest extends CMTest_TestCase {
+
+    /**
+     * @var Smarty_Internal_Template
+     */
+    private $_template;
+
+    public function setUp() {
+        $smarty = new Smarty();
+        $render = new CM_Frontend_Render();
+        $this->_template = $smarty->createTemplate('string:');
+        $this->_template->assignGlobal('render', $render);
+    }
+
+    public function testRender() {
+        $paramsFail = array(
+            'file' => 'badFileName.tpl',
+        );
+
+        $exception = $this->catchException(function () use ($paramsFail) {
+            smarty_function_load($paramsFail, $this->_template);
+        });
+
+        $this->assertInstanceOf('CM_Exception_Invalid', $exception);
+        $this->assertSame('Cannot find `badFileName.tpl` in modules `CM` and themes `default`', $exception->getMessage());
+
+        $paramsPass = array(
+            'file'   => 'badFileName.tpl',
+            'needed' => false,
+        );
+
+        $this->assertSame('', smarty_function_load($paramsPass, $this->_template));
+    }
+}