Commit b4f3f515 authored by Marius Cramer's avatar Marius Cramer

Merge branch 'fix_initial_ip_select' into 'master'

Fix initial ip select

See merge request !122
parents a7f96ca5 eed9fb8f
......@@ -458,9 +458,13 @@ class page_action extends tform_actions {
}
$server_id = intval(@$this->dataRecord["server_id"]);
} else {
// 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']);
$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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment