Merge branch 'fix_initial_ip_select' into 'master'

Fix initial ip select

See merge request !122

interface/web/sites/web_vhost_domain_edit.php

@@ -458,10 +458,14 @@ class page_action extends tform_actions {
 					}
 					$server_id = intval(@$this->dataRecord["server_id"]);
 				} else {
+					$settings = $app->getconf->get_global_config('sites');
+					$server_id = intval($settings['default_webserver']);
+					if (!$server_id) {
 						// Get the first server ID
 						$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
 						$server_id = intval($tmp['server_id']);
 					}
+				}
 
 				//* get global web config
 				$web_config = $app->getconf->get_server_config($server_id, 'web');