Changeset 6983

Timestamp:

02/22/08 17:43:56 (6 months ago)

Author:

ryan

Message:

Notice fixes from nbachiyski. fixes #5961

Files:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (3 diffs)
• trunk/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-admin/includes/dashboard.php (modified) (1 diff)
• trunk/wp-admin/includes/post.php (modified) (8 diffs)
• trunk/wp-admin/includes/taxonomy.php (modified) (1 diff)
• trunk/wp-admin/media-upload.php (modified) (1 diff)
• trunk/wp-admin/post.php (modified) (1 diff)
• trunk/wp-includes/canonical.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/post.php (modified) (3 diffs)
• trunk/wp-includes/query.php (modified) (1 diff)
• trunk/wp-includes/taxonomy.php (modified) (3 diffs)
• trunk/wp-includes/widgets.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -8 +8 @@
-    die('-1');
-
-
+isset($_GET['action']) && 
-    if ( !current_user_can( 'manage_categories' ) )
-        die('-1');
@@ -21 +21 @@
-}
-
-(int) $_POST['id']
+isset($_POST['id'])? (int) $_POST['id'] : 0
-switch ( $action = $_POST['action'] ) :
-case 'add-post' :
@@ -166 +166 @@
-    if ( 0 > $parent = (int) $_POST['newcat_parent'] )
-        $parent = 0;
-
-_POST['post_category']
+
+post_category
-
-    $x = new WP_Ajax_Response();

trunk/wp-admin/edit-form-advanced.php

@@ -1 +1 @@
-<?php
+$action = isset($action)? $action : '';
-if ( isset($_GET['message']) )
-    $_GET['message'] = (int) $_GET['message'];
@@ -19 +20 @@
-<?php
-
-
+!isset($post_ID) || 
-    $form_action = 'post';
-    $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
@@ -137 +138 @@
-}
-
-
+ 
-    echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$post_ID", 'delete-post_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;post') . "</a>";
-?>

trunk/wp-admin/edit-page-form.php

@@ -1 +1 @@
-<?php
-
-
+!isset($post_ID) || 
-    $form_action = 'post';
-    $nonce_action = 'add-page';

trunk/wp-admin/includes/dashboard.php

@@ -171 +171 @@
-    global $wp_registered_widgets, $wp_registered_widget_controls;
-
+    $sidebar_defaults = array('widget_id' => 0, 'before_widget' => '', 'after_widget' => '', 'before_title' => '', 'after_title' => '');
+    extract( $sidebar_defaults, EXTR_PREFIX_ALL, 'sidebar' );
-    extract( $params[0], EXTR_PREFIX_ALL, 'sidebar' );
+
+    if ( !isset($wp_registered_widgets[$sidebar_widget_id]) || !is_array($wp_registered_widgets[$sidebar_widget_id]) ) {
+        return $params;
+    }
+    $widget_defaults = array('id' => '', 'width' => '', 'height' => '', 'class' => '', 'feed_link' => '', 'all_link' => '', 'notice' => false, 'error' => false);
+    extract( $widget_defaults, EXTR_PREFIX_ALL, 'widget' );
-    extract( $wp_registered_widgets[$sidebar_widget_id], EXTR_PREFIX_ALL, 'widget' );
-

trunk/wp-admin/includes/post.php

@@ -29 +29 @@
-    $_POST['post_content'] = $_POST['content'];
-    $_POST['post_excerpt'] = $_POST['excerpt'];
-$_POST['parent_id']
+isset($_POST['parent_id'])? $_POST['parent_id'] : ''
-    $_POST['to_ping'] = $_POST['trackback_url'];
-
@@ -53 +53 @@
-
-    // What to do based on which button they pressed
-
+ isset($_POST['saveasdraft']) && 
-        $_POST['post_status'] = 'draft';
-
+ isset($_POST['saveasprivate']) && 
-        $_POST['post_status'] = 'private';
-
+isset($_POST['publish']) && 
-        $_POST['post_status'] = 'publish';
-
+ isset($_POST['advanced']) && 
-        $_POST['post_status'] = 'draft';
-
@@ -92 +92 @@
-
-    // Meta Stuff
-
+isset($_POST['meta']) && 
-        foreach ( $_POST['meta'] as $key => $value )
-            update_meta( $key, $value['key'], $value['value'] );
-    }
-
-
+isset($_POST['deletemeta']) && 
-        foreach ( $_POST['deletemeta'] as $key => $value )
-            delete_meta( $key );
@@ -129 +129 @@
-    }
-
+    $post_content = '';
-    if ( !empty( $_REQUEST['content'] ) )
-        $post_content = wp_specialchars( stripslashes( $_REQUEST['content'] ));
@@ -143 +144 @@
-        $post_excerpt = '';
-
+    $post->ID = 0;
+    $post->post_name = '';
+    $post->post_author = '';
+    $post->post_date = '';
-    $post->post_status = 'draft';
-    $post->post_type = 'post';
+    $post->to_ping = '';
+    $post->pinged = '';
-    $post->comment_status = get_option( 'default_comment_status' );
-    $post->ping_status = get_option( 'default_ping_status' );
@@ -225 +232 @@
-    $_POST['post_content'] = $_POST['content'];
-    $_POST['post_excerpt'] = $_POST['excerpt'];
-$_POST['parent_id']
+isset($_POST['parent_id'])? $_POST['parent_id'] : ''
-    $_POST['to_ping'] = $_POST['trackback_url'];
-
@@ -251 +258 @@
-
-    // What to do based on which button they pressed
-
+ isset($_POST['saveasdraft']) && 
-        $_POST['post_status'] = 'draft';
-
+ isset($_POST['saveasprivate']) && 
-        $_POST['post_status'] = 'private';
-
+isset($_POST['publish']) && 
-        $_POST['post_status'] = 'publish';
-
+ isset($_POST['advanced']) && 
-        $_POST['post_status'] = 'draft';
-
@@ -572 +579 @@
-function get_sample_permalink($id, $name = null) {
-    $post = &get_post($id);
+    if (!$post->ID) {
+        return array('', '');
+    }
-    $original_status = $post->post_status;
-    $original_date = $post->post_date;

trunk/wp-admin/includes/taxonomy.php

@@ -52 +52 @@
-
-function wp_insert_category($catarr, $wp_error = false) {
+    $cat_defaults = array('cat_ID' => 0, 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
-    extract($catarr, EXTR_SKIP);
-

trunk/wp-admin/media-upload.php

@@ -12 +12 @@
-
-// IDs should be integers
-(int) $ID
-(int) $post_id
+isset($ID)? (int) $ID : 0
+isset($post_id)? (int) $post_id : 0
-
-// Require an ID for the edit screen
-
+isset($action) && 
-    wp_die(__("You are not allowed to be here"));
-

trunk/wp-admin/post.php

@@ -128 +128 @@
-        $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
-
-
+isset($_POST['addmeta']) && 
-            $location = add_query_arg( 'message', 2, wp_get_referer() );
-            $location = explode('#', $location);
-            $location = $location[0] . '#postcustom';
-
+isset($_POST['deletemeta']) && 
-            $location = add_query_arg( 'message', 3, wp_get_referer() );
-            $location = explode('#', $location);

trunk/wp-includes/canonical.php

@@ -179 +179 @@
-        $redirect['host'] = $original['host'];
-
+    // prevent notices in the comparison below
+    $original['query'] = isset($redirect['query'])? $redirect['query'] : false;
+    $original['port'] = isset($redirect['port'])? $redirect['port'] : false;
+    $redirect['query'] = isset($redirect['query'])? $redirect['query'] : false;
+    $redirect['port'] = isset($redirect['port'])? $redirect['port'] : false;
+
-    if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) {
-        $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];

trunk/wp-includes/functions.php

@@ -376 +376 @@
-    // expected_slashed ($name)
-    $option = $wpdb->get_row( "SELECT option_id, autoload FROM $wpdb->options WHERE option_name = '$name'" );
-
+is_null($option) || 
-        return false;
-    // expected_slashed ($name)

trunk/wp-includes/post.php

@@ -181 +181 @@
-        return $_post;
-    } elseif ( $output == ARRAY_A ) {
-
+
+
-    } elseif ( $output == ARRAY_N ) {
-
+
+
-    } else {
-        return $_post;
@@ -699 +701 @@
-    if ( 'raw' == $context )
-        return $post;
-
-
+
+
+
-        foreach ( array_keys(get_object_vars($post)) as $field )
-            $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
-
+
+
+
-        foreach ( array_keys($post) as $field )
-            $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
-
+
-    return $post;
-}
@@ -2367 +2372 @@
- */
-function wp_check_for_changed_slugs($post_id) {
-
+isset($_POST['wp-old-slug']) || !
-        return $post_id;
-

trunk/wp-includes/query.php

@@ -1155 +1155 @@
-        // MIME-Type stuff for attachment browsing
-
-
+isset($q['post_mime_type']) && 
-            $whichmimetype = wp_post_mime_type_where($q['post_mime_type']);
-

trunk/wp-includes/taxonomy.php

@@ -641 +641 @@
-    }
-
+    $select_this = '';
-    if ( 'all' == $fields )
-        $select_this = 't.*, tt.*';
@@ -1042 +1043 @@
-    $object_ids = implode(', ', $object_ids);
-
+    $select_this = '';
-    if ( 'all' == $fields )
-        $select_this = 't.*, tt.*';
@@ -1253 +1255 @@
-
-    $t = get_taxonomy($taxonomy);
-
+isset($t->sort) && 
-        $values = array();
-        $term_order = 0;

trunk/wp-includes/widgets.php

@@ -260 +260 @@
-    if ( is_array($sidebars_widgets) ) foreach ( $sidebars_widgets as $sidebar => $widgets )
-        if ( is_array($widgets) ) foreach ( $widgets as $widget )
-
+isset($wp_registered_widgets[$widget]['callback']) && 
-                return $sidebar;
-