From f2a9b2faec10094514c16ea2c3539f910dc2bc62 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Sep 2013 05:26:33 -0400
Subject: [PATCH] - Added warning message to language import script. - Added switch to disable import function in config.inc.php - Merged language files.
---
interface/web/client/client_template_edit.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/client_template_edit.php b/interface/web/client/client_template_edit.php
index a683800..bb2fd94 100644
--- a/interface/web/client/client_template_edit.php
+++ b/interface/web/client/client_template_edit.php
@@ -81,7 +81,7 @@
if ($this->dataRecord["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 . "'";
+ $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;
}
$clients = $app->db->queryAllRecords($sql);
if (is_array($clients)){
--
Gitblit v1.9.1