Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 6a00b4e599f724cbc9a12927c8a0446ef5621028

 interface/web/client/domain_list.php

@@ -46,11 +46,6 @@

$app->uses('listform_actions');

if(isset($_SESSION['show_warning_msg'])) {
   $app->tpl->setloop('warning', array(array('warning_msg' => '<p>'.$_SESSION['show_warning_msg'].'</p>')));
   unset($_SESSION['show_warning_msg']);
}

$app->listform_actions->SQLOrderBy = 'ORDER BY domain.domain';
$app->listform_actions->onLoad();