summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorrit Schippers2010-02-21 15:42:17 (GMT)
committer Jorrit Schippers2010-02-21 15:42:17 (GMT)
commit43776810cae4ec6011339bd54f88e84cd76f599f (patch)
tree48ec6c2bf56e22e7eaf0db60cdc04acd6c4350da
parent8ac4fa065cf424b2cb84efdcf51d74f71e7408e3 (diff)
#701736 warning after update from fck-editor 6.x-1.4 to fck-editor 6.x-2.0 and update.php
-rw-r--r--CHANGELOG.txt3
-rw-r--r--fckeditor.module13
2 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 05e028a..a28f11c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
$Id$
+-- 2010-02-21 version 6.x-2.x-dev
+* #701736 warning after update from fck-editor 6.x-1.4 to fck-editor 6.x-2.0 and update.php
+
-- 2010-01-31 version 6.x-2.x-dev
* #678170 Loading fckeditor.config.js from theme path won't always work
* Tag as version 6.x-2.0
diff --git a/fckeditor.module b/fckeditor.module
index 62bcdfd..5217ed7 100644
--- a/fckeditor.module
+++ b/fckeditor.module
@@ -1134,10 +1134,15 @@ function fckeditor_get_nodetype($get_q) {
function fckeditor_path_to_theme() {
global $theme_key;
static $themepath;
-
- if(empty($themepath)) {
- $themepath = drupal_get_path('theme', $theme_key);
+
+ if(empty($themepath) && !empty($theme_key)) {
+ $themepath = drupal_get_path('theme', $theme_key);
}
-
+
+ // fall back
+ if(empty($themepath)) {
+ return path_to_theme();
+ }
+
return $themepath;
}