r1510: In draw_cancel() [templates/global.js] we can't use double quotes for window...

diff --git a/docs/changes.txt b/docs/changes.txt
index bfac1567eac5797bb99b1687f8aed4f8c56ff546..7ed935bca3ee85d67196b9d39aaa915e2119a78d 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -17,6 +17,7 @@
 - Enhancement: Users can now belong to a single primary usergroup and multiple secondary groups, greatly increasing permission flexibility
 - Enahncement: Usergroups can be cloned to allow fast duplication of permissions
 - Fixed: Even after calling UsergroupAPI::delete(), there would still be usergroup remnants in bugfieldpermission and permission tables
+- Fixed: The javascript cancel buttons wouldn't work due to a parse error
 
 1.2.0 Beta 1
 ===============================

diff --git a/templates/global.js b/templates/global.js
index 741ab40376686b180be85938f2d840252efd5ad8..064d34690dfeeeb7bd3aff96d51da46a8357f0cf 100644 (file)
--- a/templates/global.js
+++ b/templates/global.js
@@ -20,7 +20,7 @@
 
 function draw_cancel(location)
 {
-       location = (location == "" ? "history.back(1)" : "window.location=\"" + location + "\"");
+       location = (location == "" ? "history.back(1)" : "window.location='" + location + "'");
        document.write("<input name=\"cancel\" type=\"button\" value=\"" + lang["Cancel"] + "\" onclick=\"" + location + "\" />");
 }