summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt3
-rw-r--r--includes/ckeditor.lib.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 88eae45..defa473 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,4 @@
-2012-11-27
+2012-11-28
New stable release 7.x-1.x
New features:
@@ -8,6 +8,7 @@ New features:
[#1692666] by dczepierga: Unset Ckeditor-Plugin upon module disabling/uninstalling
Bug fixes:
+[#1850626] by dczepierga: Wrong path on external plugins loaded by hook
[#1844390] by dczepierga: Undefined index: loadPlugins in ckeditor_modules_enabled()
[#1790082] by dczepierga: Order of filters calling in ckeditor filter XSS function
[#1728318] by dczepierga: Text format filters are not properly given $format; cannot look up their per-format settings
diff --git a/includes/ckeditor.lib.inc b/includes/ckeditor.lib.inc
index 6cbf8aa..3bbcaee 100644
--- a/includes/ckeditor.lib.inc
+++ b/includes/ckeditor.lib.inc
@@ -535,7 +535,7 @@ function ckeditor_load_plugins($render = FALSE) {
*/
function ckeditor_plugins_render($plugins) {
$render = array();
- $render["%base_path%"] = ckeditor_base_path('relative');
+ $render["%base_path%"] = ckeditor_base_path('relative') . '/';
$render["%editor_path%"] = ckeditor_path('relative') . '/';
$render["%module_path%"] = ckeditor_module_path('relative');
$render["%plugin_dir%"] = $render["%module_path%"] . '/plugins/';