Skip to content

Commit 7b4d443

Browse files
author
Till Brehm
committed
Merge branch '6533-domain-module-prevents-subdomains-to-be-added-for-domains-that-exist-as-website' into 'develop'
Resolve "Domain module prevents subdomains to be added for domains that exist as website" Closes #6533 See merge request ispconfig/ispconfig3!1764
2 parents 2561855 + 699aaad commit 7b4d443

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

interface/lib/classes/tools_sites.inc.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,9 @@ function convertClientName($name){
145145
}
146146

147147
/* TODO: rewrite SQL */
148-
function getDomainModuleDomains($not_used_in_table = null, $selected_domain = '') {
148+
function getDomainModuleDomains($not_used_in_table = null, $selected_domain = null) {
149149
global $app;
150150

151-
// Fix a null value passed in by the create new forms, which lack an id.
152-
if ($selected_domain == null) {
153-
$selected_domain = '';
154-
}
155151
$sql = "SELECT domain_id, domain FROM domain WHERE";
156152
if ($not_used_in_table) {
157153
if (strpos($not_used_in_table, 'dns') !== false) {

0 commit comments

Comments
 (0)