Changeset 11010

Timestamp:

04/20/2009 11:14:37 AM (15 years ago)

Author:

azaozz

Message:

Press This notice fixes, props DD32, fixes #9593

File:

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

trunk/wp-admin/press-this.php

@@ -11 +11 @@
 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
-if ( ! current_user_can('edit_posts') ) wp_die( __( 'Cheatin’ uh?' ) );
+if ( ! current_user_can('edit_posts') )
+    wp_die( __( 'Cheatin’ uh?' ) );
 
 /**
@@ -42 +43 @@
     // define some basic variables
     $quick['post_status'] = 'draft'; // set as draft first
-    $quick['post_category'] = $_REQUEST['post_category'];
-    $quick['tax_input'] = $_REQUEST['tax_input'];
-    $quick['post_title'] = $_REQUEST['title'];
+    $quick['post_category'] = isset($_REQUEST['post_category']) ? $_REQUEST['post_category'] : null;
+    $quick['tax_input'] = isset($_REQUEST['tax_input']) ? $_REQUEST['tax_input'] : '';
+    $quick['post_title'] = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';
     $quick['post_content'] = '';
 
     // insert the post with nothing in it, to get an ID
     $post_ID = wp_insert_post($quick, true);
-    $content = $_REQUEST['content'];
-
-    if( $_REQUEST['photo_src'] && current_user_can('upload_files') )
+    $content = isset($_REQUEST['content']) ? $_REQUEST['content'] : '';
+
+    $upload = false;
+    if( !empty($_REQUEST['photo_src']) && current_user_can('upload_files') )
         foreach( (array) $_REQUEST['photo_src'] as $key => $image)
             // 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]);
+                $desc = isset($_REQUEST['photo_description'][$key]) ? $_REQUEST['photo_description'][$key] : '';
+                $upload = media_sideload_image($image, $post_ID, $desc);
                 
                 // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
@@ -80 +83 @@
 
 // For submitted posts.
-if ( 'post' == $_REQUEST['action'] ) {
+if ( isset($_REQUEST['action']) && 'post' == $_REQUEST['action'] ) {
     check_admin_referer('press-this');
     $post_ID = press_it();
     $posted =  $post_ID;
+} else {
+    $post_ID = 0;
 }
 
 // Set Variables
-$title = wp_specialchars(aposfix(stripslashes($_GET['t'])));
-$selection = trim( aposfix( stripslashes($_GET['s']) ) );
+$title = isset($_GET['t']) ? wp_specialchars(aposfix(stripslashes($_GET['t']))) : '';
+$selection = isset($_GET['s']) ? trim( aposfix( stripslashes($_GET['s']) ) ) : '';
 if ( ! empty($selection) ) {
     $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
     $selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
 }
-$url = clean_url($_GET['u']);
-$image = $_GET['i'];
-
-if($_REQUEST['ajax']) {
+$url = isset($_GET['u']) ? clean_url($_GET['u']) : '';
+$image = isset($_GET['i']) ? $_GET['i'] : '';
+
+if ( !empty($_REQUEST['ajax']) ) {
 switch ($_REQUEST['ajax']) {
     case 'video': ?>
@@ -468 +473 @@
                     <div id="categories-all" class="ui-tabs-panel">
                         <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-                            <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
+                            <?php wp_category_checklist($post_ID, false) ?>
                         </ul>
                     </div>