Wordpress 2.9

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / paste / js / pasteword.js

diff --git a/wp-includes/js/tinymce/plugins/paste/js/pasteword.js b/wp-includes/js/tinymce/plugins/paste/js/pasteword.js
index fb3e54da2ac130ff6696b434d1d01e79d7973696..959bf3992d230c71f72134061db535a4f4a05c77 100644 (file)
--- a/wp-includes/js/tinymce/plugins/paste/js/pasteword.js
+++ b/wp-includes/js/tinymce/plugins/paste/js/pasteword.js
@@ -13,7 +13,7 @@ var PasteWordDialog = {
                css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")];
                css = css.concat(tinymce.explode(ed.settings.content_css) || []);
                tinymce.each(css, function(u) {
-                       cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />';
+                       cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute('' + u) + '" rel="stylesheet" type="text/css" />';
                });
 
                // Write content into iframe
@@ -32,7 +32,7 @@ var PasteWordDialog = {
        insert : function() {
                var h = document.getElementById('iframe').contentWindow.document.body.innerHTML;
 
-               tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h);
+               tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true});
                tinyMCEPopup.close();
        },