Merge branch 'MDL-56673-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE

2016-11-02 12:16:28 +08:00
parent 7c889e2f08 3fe2093f3b
commit 8b2fb6720c
2 changed files with 4 additions and 3 deletions
@@ -111,7 +111,7 @@ class api {
     *
     * @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 @@ class api {
        }

        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);
@@ -107,7 +107,7 @@ class external extends external_api {
     *
     * @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(),