Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/login/index.php

@@ -209,13 +209,15 @@
                  $user = $app->db->toLower($user);
                  
                  if ($loginAs) $oldSession = $_SESSION['s'];
                  if (!$loginAs) session_regenerate_id(true);
                  // Session regenerate causes login problems on some systems, have to find a better way. see Issue #3827
                  //if (!$loginAs) session_regenerate_id(true);
                  $_SESSION = array();
                  if ($loginAs) $_SESSION['s_old'] = $oldSession; // keep the way back!
                  $_SESSION['s']['user'] = $user;
                  $_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
                  $_SESSION['s']['language'] = $user['language'];
                  $_SESSION["s"]['theme'] = $_SESSION['s']['user']['theme'];
                  if ($loginAs) $_SESSION['s']['plugin_cache'] = $_SESSION['s_old']['plugin_cache'];
                  
                  if(is_file(ISPC_WEB_PATH . '/' . $_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
                     include_once ISPC_WEB_PATH . '/' . $_SESSION['s']['user']['startmodule'].'/lib/module.conf.php';