Merge branch 'revert-7827db36' into 'stable-3.1'

Pascal Dreissen

2016-07-08 6a00e0d41d0a7267878afa1b751427b26853e2f6

 server/plugins-available/apache2_plugin.inc.php

@@ -1207,8 +1207,8 @@
         if(is_array($aliasdomains)) {
            foreach($aliasdomains as $aliasdomain) {
               $temp_domains[] = $aliasdomain['domain'];
               if(isset($aliasdomain['subdomain']) && (! empty($aliasdomain['subdomain']) && $aliasdomain['subdomain']) != "none" ) {
                  $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
               if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
                  $temp_domains[] = "www." . $aliasdomain['domain'];
               }
            }
         }