Index: editors/ckeditor.inc
=========================================================
--- editors/ckeditor.inc	(revision 1.7)
+++ editors/ckeditor.inc	Wed Jun 23 09:55:25 EDT 2010
@@ -166,7 +166,7 @@
         $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' => drupal_get_path('theme', variable_get('theme_default','none'))));
       }
     }
     else {
@@ -174,7 +174,7 @@
         $settings['contentsCss'] = wysiwyg_get_css();
       }
       elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-        $settings['contentsCss'] = explode(',', strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme())));
+        $settings['contentsCss'] = explode(',', strtr($config['css_path'], array('%b' => base_path(), '%t' => drupal_get_path('theme', variable_get('theme_default','none')))));
       }
     }
   }
Index: editors/fckeditor.inc
=========================================================
--- editors/fckeditor.inc	(revision 1.20)
+++ editors/fckeditor.inc	Wed Jun 23 09:55:44 EDT 2010
@@ -133,7 +133,7 @@
       $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
     }
     else if ($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' => drupal_get_path('theme', variable_get('theme_default','none'))));
     }
   }
 
Index: editors/nicedit.inc
=========================================================
--- editors/nicedit.inc	(revision 1.7)
+++ editors/nicedit.inc	Wed Jun 23 09:54:54 EDT 2010
@@ -86,7 +86,7 @@
       }
     }
     else if ($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' => drupal_get_path('theme', variable_get('theme_default','none'))));
     }
   }
 
Index: editors/openwysiwyg.inc
=========================================================
--- editors/openwysiwyg.inc	(revision 1.6)
+++ editors/openwysiwyg.inc	Wed Jun 23 09:55:49 EDT 2010
@@ -104,7 +104,7 @@
       $settings['CSSFile'] = reset(wysiwyg_get_css());
     }
     else if ($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' => drupal_get_path('theme', variable_get('theme_default','none'))));
     }
   }
 
Index: editors/tinymce.inc
=========================================================
--- editors/tinymce.inc	(revision 1.39)
+++ editors/tinymce.inc	Wed Jun 23 09:55:35 EDT 2010
@@ -192,7 +192,7 @@
       $settings['content_css'] = implode(',', wysiwyg_get_css());
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+      $settings['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => drupal_get_path('theme', variable_get('theme_default','none'))));
     }
   }
 
Index: editors/whizzywig.inc
=========================================================
--- editors/whizzywig.inc	(revision 1.6)
+++ editors/whizzywig.inc	Wed Jun 23 09:55:30 EDT 2010
@@ -110,7 +110,7 @@
       }
     }
     else if ($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' => drupal_get_path('theme', variable_get('theme_default','none'))));
     }
   }
 
Index: editors/wymeditor.inc
=========================================================
--- editors/wymeditor.inc	(revision 1.8)
+++ editors/wymeditor.inc	Wed Jun 23 09:55:40 EDT 2010
@@ -176,7 +176,7 @@
       $settings['stylesheet'] = reset(wysiwyg_get_css());
     }
     else if ($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' => drupal_get_path('theme', variable_get('theme_default','none'))));
     }
   }
 
Index: editors/yui.inc
=========================================================
--- editors/yui.inc	(revision 1.10)
+++ editors/yui.inc	Wed Jun 23 09:54:39 EDT 2010
@@ -203,7 +203,7 @@
       $settings['extracss'] = wysiwyg_get_css();
     }
     else if ($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' => drupal_get_path('theme', variable_get('theme_default','none'))));
       $settings['extracss'] = explode(',', $settings['extracss']);
     }
     // YUI only supports inline CSS, so we need to use @import directives.