Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/tools/user_settings.php

@@ -44,10 +44,6 @@
//* Check permissions for module
$app->auth->check_module_permissions('tools');

if($_SESSION['s']['user']['typ'] == 'admin') {
   $app->auth->check_security_permissions('admin_allow_new_admin');
}

// Loading classes
$app->uses('tpl,tform,tform_actions');
$app->load('tform_actions');
@@ -102,7 +98,7 @@
      global $app;
      
      if($_POST['passwort'] != '') {
         $tmp_user = $app->db->queryOneRecord("SELECT passwort FROM sys_user WHERE userid = '".$app->functions->intval($_SESSION['s']['user']['userid'])."'");
         $tmp_user = $app->db->queryOneRecord("SELECT passwort FROM sys_user WHERE userid = ?", $_SESSION['s']['user']['userid']);
         $_SESSION['s']['user']['passwort'] = $tmp_user['passwort'];
         unset($tmp_user);
      }