diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5619b159e1de852ff8b970b768c9652e69491407..f09497b59f1a4e9f1bdd59ba3b2d75db17eb5989 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,9 +6,6 @@ Wysiwyg x.x-x.x, xxxx-xx-xx Wysiwyg 7.x-3.x, xxxx-xx-xx --------------------------- -#582298 by dereine: Added auto-paste from Word detection for FCKeditor. -#597852 by sun: Fixed missing Turkish in language list. -#620176 by sun: Fixed missing Ukrainian in language list. #612954 by TwoD: Fixed broken editor settings. #585932 by sun: Ported to Drupal 7. @@ -25,6 +22,11 @@ Wysiwyg 6.x-3.x, xxxx-xx-xx #695768 by sun: Fixed #resizable removed when no editor profiles are loaded. #631494 by TwoD: Fixed multi-site libraries directory failure for WYMeditor. #660080 by TwoD: Fixed Notice: Undefined offset. +#613922 by TwoD, sun: Fixed PHP warning when saving profiles. +#582298 by dereine: Added auto-paste from Word detection for FCKeditor. +#597852 by sun: Fixed missing Turkish in language list. +#620176 by sun: Fixed missing Ukrainian in language list. +#613480 by TwoD, Dave Reid: Fixed PHP 5.3 compatibility. #462146 by TwoD: Cleaned up CKEditor implementation. #380586 by SimonEast: Updated YUI editor: Version detection not working. #610132 by TwoD: Updated CKEditor 3.0.1, stylesheets and version check. diff --git a/plugins/break/break.js b/plugins/break/break.js index 649759fe495935ea0cf84918030acf29be2752f6..5f0ea63762c4eef7a0e9244cd3c6467e9df2096e 100644 --- a/plugins/break/break.js +++ b/plugins/break/break.js @@ -1,6 +1,6 @@ // $Id$ - (function ($) { + // @todo Array syntax required; 'break' is a predefined token in JavaScript. Drupal.wysiwyg.plugins['break'] = { @@ -65,4 +65,5 @@ Drupal.wysiwyg.plugins['break'] = { return '<--break->'; } }; + })(jQuery);