From 1bad88c7e5716073be876ee5cfee7a3cfe6a9eae Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Tue, 29 Mar 2016 13:31:30 -0400 Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 --- interface/web/admin/form/directive_snippets.tform.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interface/web/admin/form/directive_snippets.tform.php b/interface/web/admin/form/directive_snippets.tform.php index 0c2502c..4d34fef 100644 --- a/interface/web/admin/form/directive_snippets.tform.php +++ b/interface/web/admin/form/directive_snippets.tform.php @@ -110,7 +110,7 @@ 'formtype' => 'CHECKBOXARRAY', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => "SELECT directive_snippets_id,name FROM directive_snippets WHERE type = 'php' AND active = 'y'ORDER BY name", + 'querystring' => "SELECT directive_snippets_id,name FROM directive_snippets WHERE type = 'php' AND active = 'y' AND master_directive_snippets_id = 0 ORDER BY name", 'keyfield' => 'directive_snippets_id', 'valuefield' => 'name' ), -- Gitblit v1.9.1