From 0803ac586d048d3d93275d8a5d89370c8add4f45 Mon Sep 17 00:00:00 2001 From: Harry Foster Date: Mon, 22 Jan 2018 16:53:30 +0000 Subject: [PATCH] Fix provisioning templates ignoring domain specific templates (#2960) * Moved multi-tenant template directory statement to before the templating engine initialisation. * Revert "Moved multi-tenant template directory statement to before the templating engine initialisation." Formatting issue, needless diffs. This reverts commit 04547a133729be12225f04814b67940f3b0bc738. * Moved multi-tenant template directory statement to before the template --- app/provision/resources/classes/provision.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index 16bd880351..62358470b4 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -812,6 +812,15 @@ include "root.php"; } unset ($prep_statement); } + //set the template directory + if (strlen($provision["template_dir"]) > 0) { + $template_dir = $provision["template_dir"]; + } + + //if the domain name directory exists then only use templates from it + if (is_dir($template_dir.'/'.$domain_name)) { + $device_template = $domain_name.'/'.$device_template; + } //initialize a template object $view = new template(); @@ -1238,16 +1247,6 @@ include "root.php"; } } - //set the template directory - if (strlen($provision["template_dir"]) > 0) { - $template_dir = $provision["template_dir"]; - } - - //if the domain name directory exists then only use templates from it - if (is_dir($template_dir.'/'.$domain_name)) { - $device_template = $domain_name.'/'.$device_template; - } - //if $file is not provided then look for a default file that exists if (strlen($file) == 0) { if (file_exists($template_dir."/".$device_template ."/{\$mac}")) {