MDL-56673 templatelibrary: return false when core template doesn't exist

moodle · Nov 1, 2016 · 8297422 · 8297422
1 parent f4f89d4
commit 8297422
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/admin/tool/templatelibrary/classes/api.php b/admin/tool/templatelibrary/classes/api.php
@@ -111,7 +111,7 @@ public static function list_templates($component = '', $search = '', $themename
      *
      * @param string $component The component that holds the template.
      * @param string $template The name of the template.
-     * @return string the template
+     * @return string the template or false if template doesn't exist.
      */
     public static function load_canonical_template($component, $template) {
         // Get the list of possible template directories.
@@ -133,7 +133,8 @@ public static function load_canonical_template($component, $template) {
         }
 
         if ($filename === false) {
-            throw new moodle_exception('filenotfound', 'error');
+            // There are occasions where we don't have a core template.
+            return false;
         }
 
         $templatestr = file_get_contents($filename);

diff --git a/admin/tool/templatelibrary/classes/external.php b/admin/tool/templatelibrary/classes/external.php
@@ -107,7 +107,7 @@ public static function load_canonical_template_parameters() {
      *
      * @param string $component The component that holds the template.
      * @param string $template The name of the template.
-     * @return string the template
+     * @return string the template, false if template doesn't exist.
      */
     public static function load_canonical_template($component, $template) {
         $params = self::validate_parameters(self::load_canonical_template_parameters(),