Changeset 19381 for trunk/wp-admin/press-this.php

Timestamp:

11/21/2011 06:32:39 PM (13 years ago)

Author:

azaozz

Message:

Press This: fix duplicate HTML IDs, add the 'default_post_to_edit' ID, fix minor RTL css, fixes #18989

File:

• trunk/wp-admin/press-this.php (modified) (9 diffs)

trunk/wp-admin/press-this.php

@@ -28 +28 @@
 function press_it() {
 
-    $post = get_default_post_to_edit('post', true);
+    $post = get_default_post_to_edit();
     $post = get_object_vars($post);
-    $post_ID = $post['ID'];
-    $post['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
-    $post['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
+    $post_ID = $post['ID'] = (int) $_POST['post_id'];
+
+    if ( !current_user_can('edit_post', $post_ID) )
+        wp_die(__('You are not allowed to edit this post.'));
+
+    $post['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : '';
+    $post['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : '';
     $post['post_title'] = isset($_POST['title']) ? $_POST['title'] : '';
-    $post['post_content'] = isset($_POST['content']) ? $_POST['content'] : '';
+    $content = isset($_POST['content']) ? $_POST['content'] : '';
 
     $upload = false;
@@ -51 +55 @@
     }
     // set the post_content and status
+    $post['post_content'] = $content;
     if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
         $post['post_status'] = 'publish';
@@ -71 +76 @@
         }
 
-        wp_update_post($post);
+        $post_ID = wp_update_post($post);
     }
 
@@ -82 +87 @@
     $posted = $post_ID = press_it();
 } else {
-    $post_ID = 0;
+    $post = get_default_post_to_edit('post', true);
+    $post_ID = $post->ID;
 }
 
@@ -138 +144 @@
                 /* ]]> */
             </script>
-            <h3 class="tb"><label for="this_photo_description"><?php _e('Description') ?></label></h3>
+            <h3 class="tb"><label for="tb_this_photo_description"><?php _e('Description') ?></label></h3>
             <div class="titlediv">
                 <div class="titlewrap">
-                    <input id="this_photo_description" name="photo_description" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo esc_attr($title);?>"/>
+                    <input id="tb_this_photo_description" name="photo_description" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo esc_attr($title);?>"/>
                 </div>
             </div>
 
             <p class="centered">
-                <input type="hidden" name="this_photo" value="<?php echo esc_attr($image); ?>" id="this_photo" />
+                <input type="hidden" name="this_photo" value="<?php echo esc_attr($image); ?>" id="tb_this_photo" />
                 <a href="#" class="select">
                     <img src="<?php echo esc_url($image); ?>" alt="<?php echo esc_attr(__('Click to insert.')); ?>" title="<?php echo esc_attr(__('Click to insert.')); ?>" />
@@ -266 +272 @@
 
         function image_selector() {
+            var desc = jQuery('#tb_this_photo_description').val() || '', src = jQuery('#tb_this_photo').val() || '';
+
             tb_remove();
-            desc = jQuery('#this_photo_description').val();
-            src = jQuery('#this_photo').val();
             pick(src, desc);
             jQuery('#extra-fields').hide();
@@ -274 +280 @@
             return false;
         }
-            jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
-            jQuery('#img_container').html(strtoappend);
+
+        jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
+        jQuery('#img_container').html(strtoappend);
         <?php break;
 }
@@ -304 +311 @@
 
     function insert_plain_editor(text) {
-        edInsertContent(text);
+        if ( typeof(QTags) != 'undefined' )
+            QTags.insertContent(text);
     }
     function set_editor(text) {
-        if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>';
-        if ( tinyMCE.activeEditor ) tinyMCE.execCommand('mceSetContent', false, text);
+        if ( '' == text || '<p></p>' == text )
+            text = '<p><br /></p>';
+
+        if ( tinyMCE.activeEditor )
+            tinyMCE.execCommand('mceSetContent', false, text);
     }
     function insert_editor(text) {
@@ -427 +438 @@
             <input type="hidden" id="original_post_status" name="original_post_status" value="draft" />
             <input type="hidden" id="prev_status" name="prev_status" value="draft" />
+            <input type="hidden" id="post_id" name="post_id" value="<?php echo (int) $post_ID; ?>" />
 
             <!-- This div holds the photo metadata -->