summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorrit Schippers2009-08-16 17:30:44 (GMT)
committer Jorrit Schippers2009-08-16 17:30:44 (GMT)
commitbe2f73b6d84c0e49cf6aa6ac2e79e3e695b3843f (patch)
treefcc396b974a30335f34ffaa3440779ea69201931
parent6b806d655c01482e93f1fe0d0adb23a2c85043c9 (diff)
#410398 Smiley not in DrupalFull toolbar
-rw-r--r--CHANGELOG.txt1
-rw-r--r--fckeditor.config.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 194fbcc..52b5b21 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ $Id$
* #536776 SECURITY: file manager should refuse to work with fckeditor library older than 2.6.4.1
* #488090 Custom upload path not working when using private folders
* #541126 Support CVS versions of img_assist
+* #410398 Smiley not in DrupalFull toolbar
-- 2009-08-05 version 6.x-2.x-dev
* #293976 Add parameters to clear static variables in functions
diff --git a/fckeditor.config.js b/fckeditor.config.js
index 94b5b63..4655f8d 100644
--- a/fckeditor.config.js
+++ b/fckeditor.config.js
@@ -41,7 +41,7 @@ FCKConfig.ToolbarSets['DrupalFull'] = [
*/
//['Link','Unlink','LinkToNode','LinkToMenu','Anchor'],
['Link','Unlink','Anchor'],
-['Image','Flash','Table','Rule','SpecialChar','DrupalBreak'],
+['Image','Flash','Table','Rule','Smiley','SpecialChar','DrupalBreak'],
//uncomment this line to enable the page break button
//remember to load appropriate plugin with FCKConfig.Plugins.Add
//['Image','Flash','Table','Rule','SpecialChar','DrupalBreak','DrupalPageBreak'],