diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-11-20 01:31:19 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-11-20 01:31:19 +0100 |
| commit | d933011668c5731b82c23a2ae8272a9488f5640c (patch) | |
| tree | 3e36200a325501ce26fb1ef93a195cf6e6621937 /includes/account.php | |
| parent | 4942782d3a52b8a067a63af5767425f6f022f83e (diff) | |
| parent | fba0e788405dc3aa4a27bdad228d3568e8faf214 (diff) | |
| download | cacert-devel-d933011668c5731b82c23a2ae8272a9488f5640c.tar.gz cacert-devel-d933011668c5731b82c23a2ae8272a9488f5640c.tar.xz cacert-devel-d933011668c5731b82c23a2ae8272a9488f5640c.zip | |
Merge branch 'bug-966' into release
Diffstat (limited to 'includes/account.php')
| -rw-r--r-- | includes/account.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/account.php b/includes/account.php index 24c61d8..55c9f7a 100644 --- a/includes/account.php +++ b/includes/account.php @@ -35,6 +35,12 @@ exit; } + if ($process == _("Cancel")) + { + // General reset CANCEL process requests + $process = ""; + } + if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46) { @@ -2198,7 +2204,7 @@ $orgid = 0; } - if($oldid == 31 && $process != _("Cancel")) + if($oldid == 31 && $process != "") { $query = "select * from `orgdomains` where `orgid`='".intval($_SESSION['_config']['orgid'])."'"; $dres = mysql_query($query); |