Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-11-20 1a2cbfbf0cd666af05c28c3a7e51de3fb59bdd99

 interface/web/tools/user_settings.php

@@ -63,7 +63,7 @@
      $app->tform->loadFormDef($tform_def_file);

      // Importing ID
      $this->id = $_SESSION['s']['user']['userid'];
      $this->id = $app->functions->intval($_SESSION['s']['user']['userid']);
      $_POST['id'] = $_SESSION['s']['user']['userid'];

      if(count($_POST) > 1) {
@@ -86,8 +86,12 @@
      if($_POST['passwort'] != $_POST['repeat_password']) {
         $app->tform->errorMessage = $app->tform->lng('password_mismatch');
      }
      $_SESSION['s']['user']['language'] = $_POST['language'];
      $_SESSION['s']['language'] = $_POST['language'];
      if(preg_match('/[a-z]{2}/',$_POST['language'])) {
         $_SESSION['s']['user']['language'] = $_POST['language'];
         $_SESSION['s']['language'] = $_POST['language'];
      } else {
         $app->error('Invalid language.');
      }
   }