summaryrefslogtreecommitdiff
path: root/includes/account.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-01-10 13:32:37 +0100
committerMichael Tänzer <neo@nhng.de>2012-01-10 13:32:37 +0100
commit923efbdb9d77f2976d2eb6584a1bb922c0cfaf90 (patch)
treeef816048edfdf64d07d33e4e5d55653db8ebdb00 /includes/account.php
parentffeed4b555aa9c0088c43d1dbfbd810d3b177c01 (diff)
parent22fb084237713f5041def5161a2df884b1b24f74 (diff)
downloadcacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.gz
cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.xz
cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.zip
Merge branch 'release' into bug-985bug-985
Conflicts: www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/account.php')
-rw-r--r--includes/account.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/account.php b/includes/account.php
index ebae1f6..554713e 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -36,6 +36,12 @@
exit;
}
+ if ($process == _("Cancel"))
+ {
+ // General reset CANCEL process requests
+ $process = "";
+ }
+
if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46)
{
@@ -2199,7 +2205,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);