summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2011-09-18 23:37:39 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2011-09-18 23:37:39 +0200
commit3145e550a3c96afff8536cf3418cd30d41341467 (patch)
tree7a5d58a99da4fa2ad5a3d65cc34bf33c5c86ca10
parent0f14457e5f24a78de02af90b535b9a1d80ce6281 (diff)
downloadcacert-devel-3145e550a3c96afff8536cf3418cd30d41341467.tar.gz
cacert-devel-3145e550a3c96afff8536cf3418cd30d41341467.tar.xz
cacert-devel-3145e550a3c96afff8536cf3418cd30d41341467.zip
Fix proposed by Uli in https://bugs.cacert.org/view.php?id=789
-rwxr-xr-x[-rw-r--r--]includes/account.php3
-rwxr-xr-x[-rw-r--r--]pages/account/29.php3
2 files changed, 5 insertions, 1 deletions
diff --git a/includes/account.php b/includes/account.php
index 24c61d8..bdab5db 100644..100755
--- a/includes/account.php
+++ b/includes/account.php
@@ -2147,6 +2147,9 @@
$_SESSION['_config']['errmsg'] = sprintf(_("The domain '%s' is already in a different account and is listed as valid. Can't continue."), sanitizeHTML($domain));
$id = $oldid;
$oldid=0;
+ // reset domid into its original state
+ $domid = $_SESSION['_config']['domid'];
+ $_REQUEST['domid'] = $domid;
}
}
diff --git a/pages/account/29.php b/pages/account/29.php
index c1a3def..bc930f6 100644..100755
--- a/pages/account/29.php
+++ b/pages/account/29.php
@@ -35,7 +35,8 @@
<td class="DataTD"><input type="text" name="domainname" value="<?=sanitizeHTML($_SESSION['_config']['domain'])?>"></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update")?>"></td>
+ <td class="DataTD"><input type="submit" name="process" value="<?=_("Cancel")?>"></td>
+ <td class="DataTD"><input type="submit" name="process" value="<?=_("Update")?>"></td>
</tr>
</table>
<input type="hidden" name="oldid" value="<?=intval($id)?>">