Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 72cefc438c0d279be66cd95c7b42a021ae647d51

 interface/lib/classes/validate_domain.inc.php

@@ -84,7 +84,12 @@
      global $app;
      if(empty($field_value) || $field_name != 'subdomain') return; // none set

      $check_domain = $_POST['domain'];
      if(isset($app->remoting_lib->primary_id)) {
         $check_domain = $app->remoting_lib->dataRecord['domain'];
      } else {
         $check_domain = $_POST['domain'];
      }
		
      $app->uses('ini_parser,getconf');
      $settings = $app->getconf->get_global_config('domains');
      if ($settings['use_domain_module'] == 'y') {