summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt3
-rw-r--r--fckeditor.admin.inc29
2 files changed, 19 insertions, 13 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3ca4de7..e938311 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
$Id$
+-- 2009-11-02 version 6.x-2.x-dev
+* #620226 notice: Undefined index: excl , simple_incl
+
-- 2009-10-26 version 6.x-2.x-dev
* #614612 Fix compatibility with postgresql
* Tag as version 6.x-2.0-rc2
diff --git a/fckeditor.admin.inc b/fckeditor.admin.inc
index 57f7b54..f979aa7 100644
--- a/fckeditor.admin.inc
+++ b/fckeditor.admin.inc
@@ -626,7 +626,7 @@ function fckeditor_admin_profile_form($form_state, $profile = NULL) {
'#default_value' => !empty($profile->settings['css_path']) ? $profile->settings['css_path'] : "",
'#size' => 40,
'#maxlength' => 255,
- '#description' =>
+ '#description' =>
t('Enter path to CSS file (Example: %cssexample1) or a list of CSS files separated by a comma (Example: %cssexample2). Make sure to select %defcss above.',
array(
'%cssexample1' => 'css/editor.css',
@@ -668,7 +668,7 @@ function fckeditor_admin_profile_form($form_state, $profile = NULL) {
array(
'@type' => t('styles'),
'%example' => '/fckstyles.xml',
- '%setting' => t('Define path to fckstyles.xml'),
+ '%setting' => t('Define path to fckstyles.xml'),
)) .'<br />'.
t('Available placeholders') .':<br />'.
'<strong>%h</strong> - '. t('host name (%host)', array('%host' => base_path())) .'<br />'.
@@ -1321,19 +1321,22 @@ function fckeditor_rebuild_selectors($name = NULL) {
foreach (array('excl', 'simple_incl') as $var) {
$settings[$var .'_regex'] = '';
- $rules = preg_split('/[\s,]+/', $settings[$var]);
- $regex = array();
-
- if (!empty($rules)) {
- foreach ($rules as $rule) {
- if (!empty($rule)) {
- $rule = fckeditor_parse_rule($rule);
- $regex[] = '(?:'. fckeditor_rule_to_regex($rule) .')';
+
+ if (!empty($settings[$var])) {
+ $rules = preg_split('/[\s,]+/', $settings[$var]);
+ $regex = array();
+
+ if (!empty($rules)) {
+ foreach ($rules as $rule) {
+ if (!empty($rule)) {
+ $rule = fckeditor_parse_rule($rule);
+ $regex[] = '(?:'. fckeditor_rule_to_regex($rule) .')';
+ }
}
- }
- if (!empty($regex)) {
- $settings[$var .'_regex'] = '#'. implode('|', $regex) .'#';
+ if (!empty($regex)) {
+ $settings[$var .'_regex'] = '#'. implode('|', $regex) .'#';
+ }
}
}
}