Ticket #9434: press-this-4-1.diff

wp-admin/press-this.php

@@ -69 +69 @@
                         // see if files exist in content - we don't want to upload non-used selected files.
                         if( strpos($_REQUEST['content'], $image) !== false ) {
                                 $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
-
-                                // Replace the POSTED content <img> with correct uploaded ones.
-                                // escape quote for matching
-                                $quoted = preg_quote2($image);
-                                if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
+                                
+                                // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
+                                if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote2($image).'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
                         }
 
         // set the post_content and status
@@ -461 +459 @@
 
                         <!-- This div holds the photo metadata -->
                         <div class="photolist"></div>
-
+                        
+                        <div id="submitdiv" class="stuffbox">
+                                <h3><?php _e('Publish') ?></h3>
+                                <div class="inside">
+                                        <p>
+                                                <input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" />
+                                                <input class="button-primary" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" />
+                                                <img src="images/loading-publish.gif" alt="" id="saving" style="display:none;" />
+                                        </p>
+                                </div>
+                        </div>
+                        
                         <div id="categorydiv" class="stuffbox">
                                 <h3><?php _e('Categories') ?></h3>
                                 <div class="inside">
@@ -502 +511 @@
                                         <p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags in Post Tags'); ?></a></p>
                                 </div>
                         </div>
-                        <div id="submitdiv" class="stuffbox">
-                                <h3><?php _e('Publish') ?></h3>
-                                <div class="inside">
-                                        <p>
-                                                <input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" />
-                                                <input class="button-primary" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" />
-                                                <img src="images/loading-publish.gif" alt="" id="saving" style="display:none;" />
-                                        </p>
-                                </div>
-                        </div>
                 </div>
         </div>
 

wp-admin/css/press-this.css

@@ -16 +16 @@
         background: #444 !important;
 }
 
+.tagchecklist span a {
+background: transparent url(../images/xit.gif) no-repeat 0 0;
+}
+
 #poststuff #edButtonPreview,
 #poststuff #edButtonHTML {
         -moz-border-radius: 3px 3px 0 0;