diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-30 11:17:02 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-30 11:17:02 +0000 |
| commit | 541e47c09b503df8bd9b6d149c82cb8d98ac2710 (patch) | |
| tree | 94c90cfd4eee2b1035f886877b77f53d1f1717c8 /wp-admin/includes/media.php | |
| parent | 717b64911edf6baaa2aea29e13b8e808f088e660 (diff) | |
| download | wordpress-mu-541e47c09b503df8bd9b6d149c82cb8d98ac2710.tar.gz wordpress-mu-541e47c09b503df8bd9b6d149c82cb8d98ac2710.tar.xz wordpress-mu-541e47c09b503df8bd9b6d149c82cb8d98ac2710.zip | |
WP Merge to revision 8195
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1342 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes/media.php')
| -rw-r--r-- | wp-admin/includes/media.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index d6fdec2..cf530d4 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -65,10 +65,10 @@ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = fal function media_send_to_editor($html) { ?> <script type="text/javascript"> -<!-- -top.send_to_editor('<?php echo addslashes($html); ?>'); -top.tb_remove(); ---> +/* <![CDATA[ */ +var win = window.dialogArguments || opener || parent || top; +win.send_to_editor('<?php echo addslashes($html); ?>'); +/* ]]> */ </script> <?php exit; @@ -850,7 +850,7 @@ jQuery(function($){ file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>", post_params : { "post_id" : "<?php echo $post_id; ?>", - "auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>", + "auth_cookie" : "<?php if ( is_ssl() ) echo $_COOKIE[SECURE_AUTH_COOKIE]; else echo $_COOKIE[AUTH_COOKIE]; ?>", "_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>", "type" : "<?php echo $type; ?>", "tab" : "<?php echo $tab; ?>", |