summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Danielsson2009-06-11 21:48:09 (GMT)
committer Henrik Danielsson2009-06-11 21:48:09 (GMT)
commit74528528f2b2590ee77ca81720106d3e68cf3fd2 (patch)
tree45f25e16a697c0ca908bf65e4412f27c21f98188
parent7675d19ce2c696cbe2b665a841b8df320769e457 (diff)
#394068 by kswan: Fixed missing button icon names in markItUp.
-rw-r--r--CHANGELOG.txt2
-rw-r--r--editors/markitup.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6503685..e404553 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,7 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 5.x-3.x, xxxx-xx-xx
---------------------------
-
+#394068 by kswan: Fixed missing button icon names in markItUp.
Wysiwyg 5.x-2.0, 2009-06-10
---------------------------
diff --git a/editors/markitup.inc b/editors/markitup.inc
index 218dc6a..079e7a8 100644
--- a/editors/markitup.inc
+++ b/editors/markitup.inc
@@ -149,7 +149,7 @@ function wysiwyg_markitup_settings($editor, $config, $theme) {
foreach ($config['buttons'] as $plugin) {
foreach ($plugin as $button => $enabled) {
if (isset($default_buttons[$button])) {
- $settings['markupSet'][] = $default_buttons[$button];
+ $settings['markupSet'][$button] = $default_buttons[$button];
}
}
}