Merge branch 'hotfix/CanSpecifyFullPath'

2pisoftware · Sep 10, 2019 · 0927df8 · 0927df8
2 parents ff6ba4c + 686acb3
commit 0927df8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/system/modules/admin/admin.hooks.php b/system/modules/admin/admin.hooks.php
@@ -43,4 +43,4 @@ function admin_core_dbobject_after_insert(Web $w, DbObject $object) {
  */
 function admin_core_web_before(Web $w) {
 	$w->Audit->addAuditLogEntry();
-}
+}
diff --git a/system/web.php b/system/web.php
@@ -1760,6 +1760,8 @@ function templateExists($name) {
 		$paths[] = $this->_templatePath;
 		// Add system fallback
 		$paths[] = SYSTEM_PATH . "/" . $this->_templatePath;
+		// Allow specifying the full path
+		$paths[] = ROOT_PATH;
 
 		$names = array();
 		if ($name) {