From 5b3d2c2b17c9191a60017a8d08db06b8a9366b16 Mon Sep 17 00:00:00 2001 From: florian030 <florian@schaal-24.de> Date: Tue, 25 Feb 2014 15:16:14 +0100 Subject: [PATCH] changes according to comments on merge-request --- install/sql/incremental/{upd_0070.sql => upd_0071.sql} | 0 interface/web/sites/form/database.tform.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename install/sql/incremental/{upd_0070.sql => upd_0071.sql} (100%) diff --git a/install/sql/incremental/upd_0070.sql b/install/sql/incremental/upd_0071.sql similarity index 100% rename from install/sql/incremental/upd_0070.sql rename to install/sql/incremental/upd_0071.sql diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php index 79b0a96c7e..995e020f94 100644 --- a/interface/web/sites/form/database.tform.php +++ b/interface/web/sites/form/database.tform.php @@ -79,7 +79,7 @@ $form["tabs"]['database'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL} ORDER BY web_domain.domain", + 'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain", 'keyfield'=> 'domain_id', 'valuefield'=> 'parent_domain' ), -- GitLab