From 652159ab0cc9340609ce0b60e6c6ff8edcc39f0f Mon Sep 17 00:00:00 2001 From: michal Date: Thu, 29 Sep 2011 10:14:37 +0200 Subject: [PATCH 2/2] [#1288664] CKeditor is not working in Views header and footer text areas --- ckeditor.module | 4 ++-- includes/ckeditor.utils.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ckeditor.module b/ckeditor.module index 611d6cb..1911bfc 100644 --- a/ckeditor.module +++ b/ckeditor.module @@ -1322,7 +1322,7 @@ function ckeditor_get_settings() if ($global_profile) { $global_conf = $global_profile->settings; if ($global_conf) { - $enabled = ckeditor_is_enabled(empty($global_conf['excl_mode']) ? '0' : $global_conf['excl_mode'], empty($global_conf['excl_regex']) ? '' : $global_conf['excl_regex'], $_POST['id'], 'admin/build/views'); + $enabled = ckeditor_is_enabled(empty($global_conf['excl_mode']) ? '0' : $global_conf['excl_mode'], empty($global_conf['excl_regex']) ? '' : $global_conf['excl_regex'], $_POST['id'], $_POST['url']); } } if ($enabled) { @@ -1330,7 +1330,7 @@ function ckeditor_get_settings() if ($profile) { $conf = array(); $conf = $profile->settings; - $enabled = ckeditor_is_enabled(empty($conf['excl_mode']) ? '0' : $conf['excl_mode'], empty($conf['excl_regex']) ? '' : $conf['excl_regex'], $_POST['id'], 'admin/build/views'); + $enabled = ckeditor_is_enabled(empty($conf['excl_mode']) ? '0' : $conf['excl_mode'], empty($conf['excl_regex']) ? '' : $conf['excl_regex'], $_POST['id'], $_POST['url']); } else { $enabled = FALSE; diff --git a/includes/ckeditor.utils.js b/includes/ckeditor.utils.js index 188fe53..3685493 100644 --- a/includes/ckeditor.utils.js +++ b/includes/ckeditor.utils.js @@ -372,7 +372,7 @@ Drupal.behaviors.ckeditor = function (context) { $.ajax({ url: path + '/admin/ckeditor/get_settings', dataType: 'json', - data: { 'id': views_textarea_id }, + data: { 'id': views_textarea_id, 'url': 'admin/build/views' }, type: 'POST', success: function( data ) { Drupal.settings.ckeditor.settings[views_textarea_id] = data; -- 1.7.4.msysgit.0