Changeset 9506

Timestamp:

11/04/2008 03:22:24 AM (16 years ago)

Author:

ryan

Message:

Notice fixes from filosofo and Viper007Bond. see #7509

Location:

trunk

Files:

• wp-admin/categories.php (modified) (2 diffs)
• wp-admin/edit-attachment-rows.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-link-categories.php (modified) (2 diffs)
• wp-admin/edit-link-form.php (modified) (2 diffs)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/import/blogger.php (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/link.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/upload.php (modified) (2 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/category.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (1 diff)

trunk/wp-admin/categories.php

@@ -231 +231 @@
 </div>
 
-<br class="clear" />
 </form>
+
+<div class="form-wrap">
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
+</div>
+
 </div>
 </div><!-- /col-right -->
@@ -279 +284 @@
 <?php } ?>
 
-<div class="form-wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
-</div>
-
 </div>
 </div><!-- /col-left -->

trunk/wp-admin/edit-attachment-rows.php

@@ -129 +129 @@
             $t_time = get_the_time(__('Y/m/d g:i:s A'));
             $m_time = $post->post_date;
-            $time = get_post_time( 'G', true );
+            $time = get_post_time( 'G', true, $post );
             if ( ( abs($t_diff = time() - $time) ) < 86400 ) {
                 if ( $t_diff < 0 )

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

@@ -205 +205 @@
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) { ?>
 <?php if ( current_user_can('publish_posts') ) : ?>
-    <?php if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+    <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
         <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" />
     <?php else : ?>

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

@@ -181 +181 @@
 <div class="col-wrap">
 
-<?php if ( current_user_can('manage_categories') ) {
+<?php if ( isset( $category ) && current_user_can('manage_categories') ) {
     $category = (object) array(); $category->parent = 0; do_action('add_link_category_form_pre', $category); ?>
 
@@ -199 +199 @@
     <label for="slug"><?php _e('Category slug') ?></label>
     <input name="slug" id="slug" type="text" value="" size="40" />
-    <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
+    <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
 

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

@@ -71 +71 @@
 
 <?php
-if ( 'edit' == $_GET['action'] && current_user_can('manage_links') )
+if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') )
     echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete&nbsp;link') . "</a>";
 ?>
@@ -342 +342 @@
 -->
 <?php
-echo $form;
-echo $link_added;
+if ( !empty($form) )
+    echo $form;
+if ( !empty($link_added) )
+    echo $link_added;
 
 wp_nonce_field( $nonce_action );

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

@@ -191 +191 @@
 if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) { ?>
 <?php if ( current_user_can('publish_posts') ) : ?>
-    <?php if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+    <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
         <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" />
     <?php else : ?>

trunk/wp-admin/import/blogger.php

@@ -815 +815 @@
         } elseif ( isset($_GET['token']) )
             $this->auth();
-        elseif ( $this->token && $this->token_is_valid() )
+        elseif ( isset($this->token) && $this->token_is_valid() )
             $this->show_blogs();
         else

trunk/wp-admin/includes/plugin-install.php

@@ -174 +174 @@
         <input type="text" name="s" id="search-field" value="<?php echo attribute_escape($term) ?>" />
         <input type="submit" name="search" value="<?php echo attribute_escape(__('Search')) ?>" class="button" />
-        <?php echo $after_submit ?>
     </form><?php
 }

trunk/wp-admin/includes/template.php

@@ -1243 +1243 @@
                 $t_time = get_the_time(__('Y/m/d g:i:s A'));
                 $m_time = $post->post_date;
-                $time = get_post_time('G', true);
+                $time = get_post_time('G', true, $post);
 
                 if ( ( abs(time() - $time) ) < 86400 ) {

trunk/wp-admin/link.php

@@ -18 +18 @@
     wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
 
-if ('' != $_POST['deletebookmarks'])
+if ( !empty($_POST['deletebookmarks']) )
     $action = 'deletebookmarks';
-if ('' != $_POST['move'])
+if ( !empty($_POST['move']) )
     $action = 'move';
-if ('' != $_POST['linkcheck'])
-    $linkcheck = $_POST[linkcheck];
+if ( !empty($_POST['linkcheck']) )
+    $linkcheck = $_POST['linkcheck'];
 
 $this_file = 'link-manager.php';

trunk/wp-admin/options.php

@@ -71 +71 @@
         foreach ( $options as $option ) {
             $option = trim($option);
-            $value = $_POST[$option];
+            $value = null;
+            if ( isset($_POST[$option]) )
+                $value = $_POST[$option];
             if ( !is_array($value) ) $value = trim($value);
             $value = stripslashes_deep($value);

trunk/wp-admin/upload.php

@@ -185 +185 @@
 foreach ( $matches as $type => $reals )
     foreach ( $reals as $real )
-        $num_posts[$type] += $_num_posts[$real];
+        $num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
 
 $class = empty($_GET['post_mime_type']) && ! isset($_GET['detached']) ? ' class="current"' : '';
@@ -195 +195 @@
         continue;
 
-    if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
+    if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
         $class = ' class="current"';
 

trunk/wp-admin/user-edit.php

@@ -223 +223 @@
 <tr>
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation. <a href="http://codex.wordpress.org/Keyboard_Shortcuts">More information</a>' ); ?></label></td>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( !empty($profileuser->comment_shortcuts) ) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation. <a href="http://codex.wordpress.org/Keyboard_Shortcuts">More information</a>' ); ?></label></td>
 </tr>
 <?php

trunk/wp-includes/canonical.php

@@ -62 +62 @@
     $redirect = $original;
     $redirect_url = false;
+
+    // Notice fixing
+    if ( !isset($redirect['path']) )  $redirect['path'] = '';
+    if ( !isset($redirect['query']) ) $redirect['query'] = '';
 
     if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {

trunk/wp-includes/category.php

@@ -278 +278 @@
     $tags = get_terms( 'post_tag', $args );
 
-    if ( empty( $tags ) )
-        return array();
+    if ( empty( $tags ) ) {
+        $return = array();
+        return $return;
+    }
 
     $tags = apply_filters( 'get_tags', $tags, $args );

trunk/wp-includes/rewrite.php

@@ -1627 +1627 @@
 
         $site_root = parse_url(get_option('siteurl'));
-        $site_root = trailingslashit($site_root['path']);
+        if ( isset( $site_root['path'] ) ) {
+            $site_root = trailingslashit($site_root['path']);
+        }
 
         $home_root = parse_url(get_option('home'));
-        $home_root = trailingslashit($home_root['path']);
+        if ( isset( $home_root['path'] ) ) {
+            $home_root = trailingslashit($home_root['path']);
+        }
 
         $rules = "<IfModule mod_rewrite.c>\n";

trunk/wp-includes/widgets.php

@@ -1552 +1552 @@
     }
 
+    $default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0 );
+    $args = wp_parse_args( $args, $default_args );
     extract( $args, EXTR_SKIP );