Press This: URL fixes for images, props noel, see #7732
git-svn-id: http://svn.automattic.com/wordpress/trunk@9115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9ce8d0f70e
commit
f5d0646a92
|
@ -61,7 +61,7 @@ function press_it() {
|
||||||
|
|
||||||
// insert the post with nothing in it, to get an ID
|
// insert the post with nothing in it, to get an ID
|
||||||
$post_ID = wp_insert_post($quick, true);
|
$post_ID = wp_insert_post($quick, true);
|
||||||
|
|
||||||
$content = $_REQUEST['content'];
|
$content = $_REQUEST['content'];
|
||||||
|
|
||||||
if($_REQUEST['photo_src'])
|
if($_REQUEST['photo_src'])
|
||||||
|
@ -81,7 +81,7 @@ function press_it() {
|
||||||
// error handling for $post
|
// error handling for $post
|
||||||
if ( is_wp_error($post_ID)) {
|
if ( is_wp_error($post_ID)) {
|
||||||
wp_die($id);
|
wp_die($id);
|
||||||
wp_delete_post($post_ID);error_log('2');
|
wp_delete_post($post_ID);
|
||||||
// error handling for media_sideload
|
// error handling for media_sideload
|
||||||
} elseif ( is_wp_error($upload)) {
|
} elseif ( is_wp_error($upload)) {
|
||||||
wp_die($upload);
|
wp_die($upload);
|
||||||
|
@ -97,9 +97,7 @@ function press_it() {
|
||||||
if ( 'post' == $_REQUEST['action'] ) {
|
if ( 'post' == $_REQUEST['action'] ) {
|
||||||
check_admin_referer('press-this');
|
check_admin_referer('press-this');
|
||||||
$post_ID = press_it();
|
$post_ID = press_it();
|
||||||
error_log($post_ID);
|
|
||||||
$posted = $post_ID;
|
$posted = $post_ID;
|
||||||
//wp_redirect('press-this.php?posted=' . press_it());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set Variables
|
// Set Variables
|
||||||
|
@ -125,8 +123,7 @@ switch ($_REQUEST['ajax']) {
|
||||||
</script>
|
</script>
|
||||||
<h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
|
<h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
|
||||||
<div class="titlewrap" >
|
<div class="titlewrap" >
|
||||||
<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo $selection; ?></textarea>
|
<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo format_to_edit($selection, true); ?></textarea>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
|
<p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
|
||||||
<?php break;
|
<?php break;
|
||||||
|
@ -192,17 +189,14 @@ switch ($_REQUEST['ajax']) {
|
||||||
|
|
||||||
$sources = array();
|
$sources = array();
|
||||||
foreach ($matches[3] as $src) {
|
foreach ($matches[3] as $src) {
|
||||||
error_log($src);
|
|
||||||
// if no http in url
|
// if no http in url
|
||||||
if(strpos($src, 'http') === false)
|
if(strpos($src, 'http') === false)
|
||||||
// if it doesn't have a relative uri
|
// if it doesn't have a relative uri
|
||||||
if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === true)
|
if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
|
||||||
$src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
|
$src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
|
||||||
else
|
else
|
||||||
$src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
|
$src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
|
||||||
|
|
||||||
$sources[] = clean_url($src);
|
$sources[] = clean_url($src);
|
||||||
error_log($src);
|
|
||||||
}
|
}
|
||||||
return "'" . implode("','", $sources) . "'";
|
return "'" . implode("','", $sources) . "'";
|
||||||
}
|
}
|
||||||
|
@ -260,7 +254,6 @@ switch ($_REQUEST['ajax']) {
|
||||||
jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
|
jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
|
||||||
insert_editor("\n\n" + '<p style="text-align: center;"><a href="<?php echo $url; ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>');
|
insert_editor("\n\n" + '<p style="text-align: center;"><a href="<?php echo $url; ?>"><img src="' + img +'" alt="' + desc + '" /></a></p>');
|
||||||
}
|
}
|
||||||
/*tinyMCE.activeEditor.resizeToContent();*/
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -499,7 +492,7 @@ die;
|
||||||
<div class="editor-container">
|
<div class="editor-container">
|
||||||
<textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
|
<textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
|
||||||
<?php if ($selection) echo wp_richedit_pre($selection); ?>
|
<?php if ($selection) echo wp_richedit_pre($selection); ?>
|
||||||
<p>via <a href="<?php echo $url ?>"><?php echo $title; ?></a>.</p>
|
<?php if ($url) { ?><p>via <a href="<?php echo $url ?>"><?php echo $title; ?></a>.</p><?php } ?>
|
||||||
</textarea>
|
</textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue