Changeset 8589

Timestamp:

08/08/2008 05:05:10 PM (16 years ago)

Author:

westi

Message:

Lots of fixes for Notices when WP_DEBUG is set. See #6669 props santosj.

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (8 diffs)
• wp-admin/edit-link-form.php (modified) (7 diffs)
• wp-admin/edit-page-form.php (modified) (7 diffs)
• wp-admin/edit-pages.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (7 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (3 diffs)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-admin/link-add.php (modified) (1 diff)
• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/menu.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)

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

@@ -1 +1 @@
 <?php
+
+if ( ! isset( $post_ID ) )
+    $post_ID = 0;
 
 $action = isset($action) ? $action : '';
 if ( isset($_GET['message']) )
     $_GET['message'] = absint( $_GET['message'] );
-$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
+$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
@@ -15 +18 @@
 $notices[1] = __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
 
-if ( !isset($post_ID) || 0 == $post_ID ) {
+if ( 0 == $post_ID ) {
     $form_action = 'post';
     $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
@@ -55 +58 @@
 <?php
 
-if ( !isset($post_ID) || 0 == $post_ID)
+if ( 0 == $post_ID)
     wp_nonce_field('add-post');
 else
@@ -124 +127 @@
 <?php endif; ?>
 <?php
-if ($post_ID) {
+if ( 0 != $post_ID ) {
     if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
         $stamp = __('Scheduled for:<br />%1$s at %2$s');
@@ -168 +171 @@
 ?>
 <br class="clear" />
-<?php if ($post_ID): ?>
+<?php if ( 0 != $post_ID ): ?>
 <?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
     $last_user = get_userdata($last_id);
@@ -186 +189 @@
 
 <ul>
-<?php if ($post_ID): ?>
+<?php if ( 0 != $post_ID ): ?>
 <li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li>
 <?php endif; ?>
@@ -346 +349 @@
 function post_password_meta_box($post) {
 ?>
-<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php if ( isset( $post->post_password ) ) : echo attribute_escape( $post->post_password ); endif; ?>" /></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
 <?php
@@ -375 +378 @@
 endif;
 
-if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
 function post_revisions_meta_box($post) {
     wp_list_post_revisions();

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

@@ -15 +15 @@
     global $link;
 
-    $link_rel = $link->link_rel;
+    $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
     $rels = preg_split('/\s+/', $link_rel);
 
@@ -93 +93 @@
 <h3><label for="link_description"><?php _e('Description') ?></label></h3>
 <div class="inside">
-    <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
+    <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo ( isset( $link->link_description ) ? $link->link_description : ''); ?>" id="link_description" /><br />
     <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
 </div>
@@ -117 +117 @@
 <div id="categories-all" class="ui-tabs-panel">
     <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-        <?php wp_link_category_checklist($link->link_id); ?>
+        <?php 
+        if ( isset($link->link_id) )
+            wp_link_category_checklist($link->link_id);
+        else
+            wp_link_category_checklist();
+        ?>
     </ul>
 </div>
@@ -138 +143 @@
 <fieldset><legend class="hidden"><?php _e('Target') ?></legend>
 <label for="link_target_blank" class="selectit">
-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
 <code>_blank</code></label><br />
 <label for="link_target_top" class="selectit">
-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
 <code>_top</code></label><br />
 <label for="link_target_none" class="selectit">
-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('none') ?></label>
 </fieldset>
@@ -157 +162 @@
     <tr>
         <th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
-        <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
+        <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( isset( $link->link_rel ) ? $link->link_rel : ''); ?>" /></td>
     </tr>
     <tr>
@@ -270 +275 @@
     <tr class="form-field">
         <th valign="top"  scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
-        <td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>
+        <td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo ( isset( $link->link_image ) ? $link->link_image : ''); ?>" style="width: 95%" /></td>
     </tr>
     <tr class="form-field">
         <th valign="top"  scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-        <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td>
+        <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo  ( isset( $link->link_rss ) ? $link->link_rss : ''); ?>" size="50" style="width: 95%" /></td>
     </tr>
     <tr class="form-field">
         <th valign="top"  scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-        <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td>
+        <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo  ( isset( $link->link_notes ) ? $link->link_notes : ''); ?></textarea></td>
     </tr>
     <tr class="form-field">
@@ -286 +291 @@
             for ($r = 0; $r < 10; $r++) {
                 echo('            <option value="'.$r.'" ');
-                if ($link->link_rating == $r)
+                if ( isset($link->link_rating) && $link->link_rating == $r)
                     echo 'selected="selected"';
                 echo('>'.$r.'</option>');

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

@@ -1 +1 @@
 <?php
+
+if ( ! isset( $post_ID ) )
+    $post_ID = 0;
+
 if ( isset($_GET['message']) )
     $_GET['message'] = absint( $_GET['message'] );
-$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
+$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
@@ -13 +17 @@
 $notices[1] = __( 'There is an autosave of this page that is more recent than the version below.  <a href="%s">View the autosave</a>.' );
 
-if (!isset($post_ID) || 0 == $post_ID) {
+if ( 0 == $post_ID) {
     $form_action = 'post';
     $nonce_action = 'add-page';
@@ -103 +107 @@
 
 <?php
-if ($post_ID) {
+if ( 0 != $post_ID ) {
     if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
         $stamp = __('Scheduled for:<br />%1$s at %2$s');
@@ -145 +149 @@
 ?>
 <br class="clear" />
-<?php if ($post_ID): ?>
+<?php if ( 0 != $post_ID ) : ?>
 <?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
     $last_user = get_userdata($last_id);
@@ -163 +167 @@
 
 <ul>
-<?php if ($post_ID): ?>
+<?php if ( 0 != $post_ID ) : ?>
 <li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
 <?php endif; ?>
@@ -241 +245 @@
 function page_password_meta_box($post){
 ?>
-<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo ( isset( $post->post_password ) ? attribute_escape( $post->post_password ) : '' ); ?>" /></p>
 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
 <?php
@@ -305 +309 @@
 
 
-if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
+if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
 function page_revisions_meta_box($post) {
     wp_list_post_revisions();

trunk/wp-admin/edit-pages.php

@@ -90 +90 @@
         continue;
 
-    if ( $status == $_GET['post_status'] )
+    if ( isset( $_GET['post_status'] ) && $status == $_GET['post_status'] )
         $class = ' class="current"';
 
@@ -120 +120 @@
 
 <?php
-$pagenum = absint( $_GET['pagenum'] );
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
 if ( empty($pagenum) )
     $pagenum = 1;
-if( !$per_page || $per_page < 0 )
+if( ! isset( $per_page ) || $per_page < 0 )
     $per_page = 20;
 

trunk/wp-admin/includes/media.php

@@ -296 +296 @@
 
 function media_upload_image() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -360 +363 @@
 
 function media_upload_audio() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -400 +406 @@
 
 function media_upload_video() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -440 +449 @@
 
 function media_upload_file() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -480 +492 @@
 
 function media_upload_gallery() {
+    $errors = array();
+
     if ( !empty($_POST) ) {
         $return = media_upload_form_handler();
@@ -494 +508 @@
 
 function media_upload_library() {
+    $errors = array();
     if ( !empty($_POST) ) {
         $return = media_upload_form_handler();
@@ -1128 +1143 @@
     $form_action_url = admin_url("media-upload.php?type={$GLOBALS['type']}&tab=library&post_id=$post_id");
 
-    $_GET['paged'] = intval($_GET['paged']);
+    $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
     if ( $_GET['paged'] < 1 )
         $_GET['paged'] = 1;

trunk/wp-admin/includes/post.php

@@ -538 +538 @@
     if ( false === $q )
         $q = $_GET;
-    $q['m']   = (int) $q['m'];
-    $q['cat'] = (int) $q['cat'];
+
+    $q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
+    $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
     $q['post_type'] = 'attachment';
     $q['post_status'] = 'any';

trunk/wp-admin/includes/template.php

@@ -264 +264 @@
 
 function wp_link_category_checklist( $link_id = 0 ) {
+    $default = 1;
+
     if ( $link_id ) {
         $checked_categories = wp_get_link_cats($link_id);
@@ -379 +381 @@
     $posts_columns = array();
     $posts_columns['cb'] = '<input type="checkbox" />';
-    if ( 'draft' === $_GET['post_status'] )
-        $posts_columns['modified'] = __('Modified');
-    elseif ( 'pending' === $_GET['post_status'] )
-        $posts_columns['modified'] = __('Submitted');
-    else
-        $posts_columns['date'] = __('Date');
+
+    $post_status = isset( $_GET['post_status'] ) ? $_GET['post_status'] : '';
+
+    switch( $post_status ) {
+        case 'draft':
+            $posts_columns['modified'] = __('Modified');
+            break;
+        case 'pending':
+            $posts_columns['modified'] = __('Submitted');
+            break;
+        default:
+            $posts_columns['date'] = __('Date');
+    }
+
     $posts_columns['title'] = __('Title');
     $posts_columns['author'] = __('Author');
-    if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
+    if ( !in_array($post_status, array('pending', 'draft', 'future')) )
         $posts_columns['comments'] = '<div class="vers"><img alt="" src="images/comment-grey-bubble.png" /></div>';
     $posts_columns['status'] = __('Status');
@@ -1211 +1221 @@
 
     foreach ( array('high', 'core', 'default', 'low') as $priority ) {
+        if ( ! isset( $wp_meta_boxes[$page][$context][$priority] ) )
+            continue;
+
         foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
             if ( false === $box )

trunk/wp-admin/includes/theme.php

@@ -36 +36 @@
             $template_data = implode( '', file( WP_CONTENT_DIR.$template ));
 
-            preg_match( '|Template Name:(.*)$|mi', $template_data, $name );
-            preg_match( '|Description:(.*)$|mi', $template_data, $description );
+            $name = '';
+            if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )
+                $name = $name[1];
 
-            $name = $name[1];
-            $description = $description[1];
+            $description = '';
+            if( preg_match( '|Description:(.*)$|mi', $template_data, $description ) )
+                $description = $description[1];
 
             if ( !empty( $name ) ) {

trunk/wp-admin/includes/update.php

@@ -8 +8 @@
 
     $cur = get_option( 'update_core' );
+    if ( ! isset( $cur->current ) )
+        $cur->current = '';
+
+    if ( ! isset( $cur->url ) )
+        $cur->url = '';
 
     switch ( $cur->response ) {

trunk/wp-admin/link-add.php

@@ -18 +18 @@
 ?>
 
-<?php if ($_GET['added'] && '' != $_POST['link_name']) : ?>
+<?php if ( isset( $_GET['added'] ) && '' != $_POST['link_name']) : ?>
 <div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>

trunk/wp-admin/link-manager.php

@@ -80 +80 @@
 <p id="post-search">
     <label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
-    <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+    <input type="text" id="post-search-input" name="s" value="<?php echo ( isset( $_GET['s'] ) ? attribute_escape(stripslashes($_GET['s'])) : ''); ?>" />
     <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
 </p>
@@ -151 +151 @@
     <tbody>
 <?php
+    $i = 0; // It is slower incrementing an undefined and valueless variable.
+
     foreach ($links as $link) {
         $link = sanitize_bookmark($link);

trunk/wp-admin/menu.php

@@ -28 +28 @@
 
 $update_plugins = get_option( 'update_plugins' );
-$update_count = count( $update_plugins->response );
+$update_count = 0;
+if ( isset( $update_plugins->response ) )
+    $update_count = count( $update_plugins->response );
+
 $menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php');
 if ( current_user_can('edit_users') )

trunk/wp-includes/canonical.php

@@ -184 +184 @@
         $redirect['host'] = $original['host'];
 
-    if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) {
+    $compare_original = array($original['host'], $original['path']);
+
+    if ( isset( $original['port'] ) )
+        $compare_original[] = $original['port'];
+
+    if ( isset( $original['query'] ) )
+        $compare_original[] = $original['query'];
+
+    $compare_redirect = array($redirect['host'], $redirect['path']);
+
+    if ( isset( $redirect['port'] ) )
+        $compare_redirect[] = $redirect['port'];
+
+    if ( isset( $redirect['query'] ) )
+        $compare_redirect[] = $redirect['query'];
+
+    if ( $compare_original !== $compare_redirect ) {
         $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
         if ( isset($redirect['port']) )

trunk/wp-includes/formatting.php

@@ -28 +28 @@
         $curl = $textarr[$i];
 
-        if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next && !$has_pre_parent) { // If it's not a tag
+        if ( !empty($curl) && '<' != $curl{0} && '[' != $curl{0} && $next && !$has_pre_parent) { // If it's not a tag
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);

trunk/wp-includes/functions.php

@@ -1412 +1412 @@
 
 function wp_get_referer() {
+    $ref = '';
     if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
         $ref = $_REQUEST['_wp_http_referer'];

trunk/wp-includes/query.php

@@ -473 +473 @@
             , 'category_name'
             , 'tag'
+            , 'cat'
             , 'tag_id'
             , 'author_name'