Index: wp-includes/link-template.php =================================================================== --- wp-includes/link-template.php (revision 12093) +++ wp-includes/link-template.php (working copy) @@ -1716,7 +1716,7 @@ l=d.location, e=encodeURIComponent, u=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=4'; - a=function(){if(!w.open(u,'t','toolbar=0,resizable=0,status=1,width=720,height=570'))l.href=u;}; + a=function(){if(!w.open(u,'t','toolbar=0,resizable=1,scrollbars=1,status=1,width=720,height=570'))l.href=u;}; if (/Firefox/.test(navigator.userAgent)) setTimeout(a, 0); else a(); void(0)"; Index: wp-admin/press-this.php =================================================================== --- wp-admin/press-this.php (revision 12093) +++ wp-admin/press-this.php (working copy) @@ -100,19 +100,19 @@ $url = isset($_GET['u']) ? esc_url($_GET['u']) : ''; $image = isset($_GET['i']) ? $_GET['i'] : ''; -if ( !empty($_GET['ajax']) ) { - switch ($_GET['ajax']) { +if ( !empty($_REQUEST['ajax']) ) { + switch ($_REQUEST['ajax']) { case 'video': ?> @@ -192,13 +192,14 @@ * @return string */ function get_images_from_uri($uri) { + $uri = preg_replace('/\/#.+?$/','', $uri); if( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') ) return "'".html_entity_decode($uri)."'"; $content = wp_remote_fopen($uri); if ( false === $content ) return ''; $host = parse_url($uri); - $pattern = '/]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif)[^<>\'\"]*)(\2)([^>]*)\/*>/is'; + $pattern = '/]*)src=(\"|\')([^<>\'\"]+)(\2)([^>]*)\/*>/is'; preg_match_all($pattern, $content, $matches); if ( empty($matches[0]) ) return ''; @@ -215,15 +216,15 @@ } return "'" . implode("','", $sources) . "'"; } - $url = urldecode($url); + $url = wp_kses(urldecode($url), null); echo 'new Array('.get_images_from_uri($url).')'; - break; case 'photo_js': ?> // gather images and load some default JS var last = null var img, img_tag, aspect, w, h, skip, i, strtoappend = ""; + if(photostorage == false) { var my_src = eval( jQuery.ajax({ type: "GET", @@ -249,7 +250,7 @@ strtoappend = ''; } } - + } for (i = 0; i < my_src.length; i++) { img = new Image(); img.src = my_src[i]; @@ -294,26 +295,12 @@ desc = jQuery('#this_photo_description').val(); src = jQuery('#this_photo').val(); pick(src, desc); - jQuery('#extra_fields').hide(); - jQuery('#extra_fields').html(''); + jQuery('#extra-fields').hide(); + jQuery('#extra-fields').html(''); return false; } - - jQuery(document).ready(function() { - jQuery('#extra_fields').html('

Photo ()

'); - jQuery('.close').click(function() { - jQuery('#extra_fields').hide(); - jQuery('#extra_fields').html(''); - }); - jQuery('.refresh').click(function() { - show('photo'); - }); + jQuery('#extra-fields').html('

Add Photos ()

'); jQuery('#img_container').html(strtoappend); - jQuery('#photo_add_url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500'); - tb_init('#extra_fields .thickbox'); - - - }); @@ -376,11 +364,10 @@ } function show(tab_name) { - jQuery('#extra_fields').html(''); - jQuery('#extra_fields').show(); + jQuery('#extra-fields').html(''); switch(tab_name) { case 'video' : - jQuery('#extra_fields').load('', { ajax: 'video', s: ''}, function() { + jQuery('#extra-fields').load('', { ajax: 'video', s: ''}, function() { jQuery('#embed-code').prepend(''); }); + jQuery('#extra-fields').show(); return false; break; case 'photo' : - jQuery('#extra_fields').before('

'); - jQuery.ajax({ - type: "GET", - cache : false, - url: "", - data: "ajax=photo_js&u=", - dataType : "script", - success : function() { - jQuery('#waiting').remove(); - } - }); + function setup_photo_actions() { + jQuery('.close').click(function() { + jQuery('#extra-fields').hide(); + jQuery('#extra-fields').html(''); + }); + jQuery('.refresh').click(function() { + photostorage = false; + show('photo'); + }); + jQuery('#photo-add-url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500'); + tb_init('#extra-fields .thickbox'); + jQuery('#waiting').hide(); + jQuery('#extra-fields').show(); + } + jQuery('#extra-fields').before('
'); + + if(photostorage == false) { + jQuery.ajax({ + type: "GET", + cache : false, + url: "", + data: "ajax=photo_js&u=", + dataType : "script", + success : function(data) { + eval(data); + photostorage = jQuery('#extra-fields').html(); + setup_photo_actions(); + } + }); + } else { + jQuery('#extra-fields').html(photostorage); + setup_photo_actions(); + } return false; break; } } jQuery(document).ready(function($) { //resize screen - window.resizeTo(720,570); + window.resizeTo(720,540); // set button actions jQuery('#photo_button').click(function() { show('photo'); return false; }); jQuery('#video_button').click(function() { show('video'); return false; }); @@ -437,7 +447,7 @@ jQuery('#title').unbind(); jQuery('#publish, #save').click(function() { jQuery('#saving').css('display', 'inline'); }); - $('#tagsdiv-post_tag, #categorydiv').children('h3').click(function(){ + $('#tagsdiv-post_tag, #categorydiv, #categorydiv').children('h3, .handlediv').click(function(){ $(this).siblings('.inside').toggle(); }); }); @@ -449,7 +459,7 @@
-

›

+

›

@@ -461,6 +471,9 @@
+
+
+

@@ -476,10 +489,14 @@

+
+
+

+
@@ -499,6 +516,9 @@
+
+
+

@@ -518,7 +538,6 @@
-

| |

@@ -529,11 +548,11 @@
+ + - -
-