summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--wysiwyg.admin.inc5
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 308b465..be1d75d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -15,6 +15,7 @@ Wysiwyg 7.x-3.x, xxxx-xx-xx
Wysiwyg 6.x-3.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 7466b83..c62fe39 100644
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -280,6 +280,11 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Save'),
+ '#weight' => 100,
+ );
+ $form['cancel'] = array(
+ '#value' => l(t('Cancel'), 'admin/config/content/wysiwyg'),
+ '#weight' => 110,
);
return $form;