Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal · Florian Schaal · commit 67bdceed3ea3 · 2015-03-06T10:29:48.000+01:00
diff --git a/interface/web/sites/web_vhost_domain_list.php b/interface/web/sites/web_vhost_domain_list.php
@@ -76,7 +76,7 @@ function onShow() {
 }
 
 $list = new list_action;
-$list->SQLExtWhere = "web_domain.type = '" . $query_type . "'" . ($show_type != 'domain' ? " AND web_domain.parent_domain_id = '0'" : "");
+$list->SQLExtWhere = "web_domain.type = '" . $query_type . "'" . ($show_type == 'domain' ? " AND web_domain.parent_domain_id = '0'" : "");
 $list->SQLOrderBy = 'ORDER BY web_domain.domain';
 $list->onLoad();
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ function onShow() {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`$list = new list_action;`
`79`		`-$list->SQLExtWhere = "web_domain.type = '" . $query_type . "'" . ($show_type != 'domain' ? " AND web_domain.parent_domain_id = '0'" : "");`
	`79`	`+$list->SQLExtWhere = "web_domain.type = '" . $query_type . "'" . ($show_type == 'domain' ? " AND web_domain.parent_domain_id = '0'" : "");`
`80`	`80`	`$list->SQLOrderBy = 'ORDER BY web_domain.domain';`
`81`	`81`	`$list->onLoad();`
`82`	`82`