From adb0e74cf23b4d766f29ef3662751cc59046a4cc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 10:09:23 -0400
Subject: [PATCH] Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-favourite_servers
---
interface/web/client/client_template_edit.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/client_template_edit.php b/interface/web/client/client_template_edit.php
index bc5c6d2..256ff49 100644
--- a/interface/web/client/client_template_edit.php
+++ b/interface/web/client/client_template_edit.php
@@ -88,10 +88,17 @@
global $app;
$app->uses('client_templates');
+ if (isset($this->dataRecord["template_type"])) {
+ $template_type = $this->dataRecord["template_type"];
+ } else {
+ $tmp = $app->tform->getDataRecord($this->id);
+ $template_type = $tmp['template_type'];
+ }
+
/*
* the template has changed. apply the new data to all clients
*/
- if ($this->dataRecord["template_type"] == 'm'){
+ if ($template_type == 'm'){
$sql = "SELECT client_id FROM client WHERE template_master = " . $this->id;
} else {
$sql = "SELECT client_id FROM client WHERE template_additional LIKE '%/" . $this->id . "/%' OR template_additional LIKE '" . $this->id . "/%' OR template_additional LIKE '%/" . $this->id . "' UNION SELECT client_id FROM client_template_assigned WHERE client_template_id = " . $this->id;
--
Gitblit v1.9.1