Merge branch 'bug-1138' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 20:58:42 +0000 (22:58 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 20:58:42 +0000 (22:58 +0200)
1  2 
includes/account.php

@@@ -2447,11 -2432,11 +2432,11 @@@ function buildSubjectFromSession() 
        {
                csrf_check('orgadmadd');
                if($_SESSION['profile']['orgadmin'] == 1)
 -                      $masteracc = $_SESSION['_config'][masteracc] = intval($_REQUEST['masteracc']);
 +                      $masteracc = $_SESSION['_config']['masteracc'] = intval($_REQUEST['masteracc']);
                else
 -                      $masteracc = $_SESSION['_config'][masteracc] = 0;
 +                      $masteracc = $_SESSION['_config']['masteracc'] = 0;
                $_REQUEST['email'] = $_SESSION['_config']['email'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['email'])));
-               $OU = $_SESSION['_config']['OU'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['OU'])));
+               $_SESSION['_config']['OU'] = stripslashes(trim($_REQUEST['OU']));
                $comments = $_SESSION['_config']['comments'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['comments'])));
                $res = mysql_query("select * from `users` where `email`='".$_REQUEST['email']."' and `deleted`=0");
                if(mysql_num_rows($res) <= 0)