Merge remote-tracking branch 'origin/master' into 0.10.0

This commit is contained in:
Michael Kaufmann
2018-06-21 08:12:00 +02:00
6 changed files with 352 additions and 316 deletions

View File

@@ -415,7 +415,7 @@ if ($page == 'domains' || $page == 'overview') {
Domains::getLocal($userinfo, $_POST)->update();
} catch (Exception $e) {
dynamic_error($e->getMessage());
}
}
redirectTo($filename, array(
'page' => $page,
's' => $s