bug 966: Same problem in other forms too.
authorMichael Tänzer <neo@nhng.de>
Tue, 16 Aug 2011 21:22:04 +0000 (23:22 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 16 Aug 2011 21:22:04 +0000 (23:22 +0200)
Generally blacklist the string _("Cancel"), whitelisting "Delete" does not
work:
a) It has to be get_text()ed
b) Any change to the wording would break the check

Following it up by a separate commit removing all process parameters in
the forms on cancel

Signed-off-by: Michael Tänzer <neo@nhng.de>
includes/account.php

index 900bbce..c1f6542 100644 (file)
                exit;
        }
 
+       if ($process == _("Cancel"))
+       {
+               // General reset CANCEL process requests
+               $process = "";
+       }
+
 
        if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46)
        {
                        $id = 32;
        }
 
-       if($oldid == 34 && $process == "Delete")
+       if($oldid == 34 && $process != "")
        {
                $orgid = intval($_SESSION['_config']['orgid']);
                $memid = intval($_REQUEST['memid']);