diff --git a/wysiwyg/editors/ckeditor.inc b/wysiwyg/editors/ckeditor.inc
index 896fc84..e67e29e 100644
--- a/wysiwyg/editors/ckeditor.inc
+++ b/wysiwyg/editors/ckeditor.inc
@@ -167,7 +167,7 @@ function wysiwyg_ckeditor_settings($editor, $config, $theme) {
$settings['contentsCss'] = reset(wysiwyg_get_css());
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['contentsCss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['contentsCss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
}
}
else {
diff --git a/wysiwyg/editors/fckeditor.inc b/wysiwyg/editors/fckeditor.inc
index fba81f6..c5afec0 100644
--- a/wysiwyg/editors/fckeditor.inc
+++ b/wysiwyg/editors/fckeditor.inc
@@ -132,7 +132,7 @@ function wysiwyg_fckeditor_settings($editor, $config, $theme) {
$settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
}
}
diff --git a/wysiwyg/editors/nicedit.inc b/wysiwyg/editors/nicedit.inc
index 55404b8..0ea1c32 100644
--- a/wysiwyg/editors/nicedit.inc
+++ b/wysiwyg/editors/nicedit.inc
@@ -83,7 +83,7 @@ function wysiwyg_nicedit_settings($editor, $config, $theme) {
}
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
}
}
diff --git a/wysiwyg/editors/openwysiwyg.inc b/wysiwyg/editors/openwysiwyg.inc
index 3a4b66c..5d12741 100644
--- a/wysiwyg/editors/openwysiwyg.inc
+++ b/wysiwyg/editors/openwysiwyg.inc
@@ -103,7 +103,7 @@ function wysiwyg_openwysiwyg_settings($editor, $config, $theme) {
$settings['CSSFile'] = reset(wysiwyg_get_css());
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['CSSFile'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['CSSFile'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
}
}
diff --git a/wysiwyg/editors/whizzywig.inc b/wysiwyg/editors/whizzywig.inc
index 96c9ead..de08bf3 100644
--- a/wysiwyg/editors/whizzywig.inc
+++ b/wysiwyg/editors/whizzywig.inc
@@ -110,7 +110,7 @@ function wysiwyg_whizzywig_settings($editor, $config, $theme) {
}
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
}
}
diff --git a/wysiwyg/editors/wymeditor.inc b/wysiwyg/editors/wymeditor.inc
index 042bc23..f5bbcfc 100644
--- a/wysiwyg/editors/wymeditor.inc
+++ b/wysiwyg/editors/wymeditor.inc
@@ -175,7 +175,7 @@ function wysiwyg_wymeditor_settings($editor, $config, $theme) {
$settings['stylesheet'] = reset(wysiwyg_get_css());
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['stylesheet'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['stylesheet'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
}
}
diff --git a/wysiwyg/editors/yui.inc b/wysiwyg/editors/yui.inc
index 845a1af..6890227 100644
--- a/wysiwyg/editors/yui.inc
+++ b/wysiwyg/editors/yui.inc
@@ -203,7 +203,7 @@ function wysiwyg_yui_settings($editor, $config, $theme) {
$settings['extracss'] = wysiwyg_get_css();
}
elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
- $settings['extracss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+ $settings['extracss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme(), '%d' => drupal_get_path('theme', variable_get('theme_default', NULL))));
$settings['extracss'] = explode(',', $settings['extracss']);
}
// YUI only supports inline CSS, so we need to use @import directives.
diff --git a/wysiwyg/wysiwyg.admin.inc b/wysiwyg/wysiwyg.admin.inc
index ff23b28..a855226 100644
--- a/wysiwyg/wysiwyg.admin.inc
+++ b/wysiwyg/wysiwyg.admin.inc
@@ -279,7 +279,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
'#default_value' => $profile->settings['css_path'],
'#size' => 40,
'#maxlength' => 255,
- '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.') . '
' . t('Available tokens: %b
(base path, eg: /
), %t
(path to theme, eg: themes/garland
)') . '
' . t('Example:') . ' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css',
+ '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.') . '
' . t('Available tokens: %b
(base path, eg: /
), %t
(path to current theme, eg: themes/garland
), %d
(path to default theme, eg: sites/themes/themename') . '
' . t('Example:') . ' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css',
);
$form['css']['css_classes'] = array(