Merge branch 'master' into 'master'

Marius Burkard

2015-11-30 e6ded3ab52b8b823660181db85be511b2ef1ffe5

 interface/web/tools/user_settings.php

@@ -97,6 +97,16 @@
         $app->error('Invalid language.');
      }
   }
	
   function onAfterUpdate() {
      global $app;
		
      if($_POST['passwort'] != '') {
         $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);
      }
   }


}