#696040 by Dave Reid: Fixed missing Cancel link on profile form.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2306b32..55050eb 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-2.x, xxxx-xx-xx
 ---------------------------
+#696040 by Dave Reid: Fixed missing Cancel link on profile form.
 #594322 by TwoD: Added insert method for NicEdit.
 #659200 by TwoD: Fixed YUI Editor content lost in IE.
 #594928 by ericbellot, TwoD, sun: Fixed 'attribs' button missing in TinyMCE.

diff --git a/wysiwyg.admin.inc b/wysiwyg.admin.inc
index 50eda71..e4338af 100644 (file)
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -281,6 +281,11 @@ function wysiwyg_profile_form($form_state, $profile) {
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
+    '#weight' => 100,
+  );
+  $form['cancel'] = array(
+    '#value' => l(t('Cancel'), 'admin/settings/wysiwyg'),
+    '#weight' => 110,
   );
 
   return $form;