Merge branch 'master' into 'master'

Marius Cramer

2014-08-18 a9e6315be66a5cf3a743a1e1a7c8da4eb980e97c

 interface/web/admin/system_config_edit.php

@@ -64,6 +64,9 @@
         $server_id = $this->id;

         $this->dataRecord = $app->getconf->get_global_config($section);
         if (is_null($this->dataRecord)) {
            $this->dataRecord = array();
         }
         if ($section == 'domains'){
            if (isset($this->dataRecord['use_domain_module'])){
               $_SESSION['use_domain_module_old_value'] = $this->dataRecord['use_domain_module'];