Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/mailuser/mail_user_password_edit.php

@@ -51,8 +51,9 @@
class page_action extends tform_actions {

   function onSubmit() {

      $this->id = $_SESSION['s']['user']['mailuser_id'];
      global $app, $conf;
		
      $this->id = $app->functions->intval($_SESSION['s']['user']['mailuser_id']);

      parent::onSubmit();