Changeset 8944

Timestamp:

09/21/2008 08:41:25 PM (17 years ago)

Author:

westi

Message:

Notice fixes see #7509 props DD32 and jacobsantos.

Location:

trunk

Files:

• wp-admin/categories.php (modified) (2 diffs)
• wp-admin/edit-category-form.php (modified) (2 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-link-categories.php (modified) (1 diff)
• wp-admin/edit-link-category-form.php (modified) (2 diffs)
• wp-admin/edit-tag-form.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (3 diffs)
• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/includes/widgets.php (modified) (2 diffs)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/categories.php

@@ -14 +14 @@
 wp_reset_vars(array('action', 'cat'));
 
-if ( $_GET['action'] == 'delete' && isset($_GET['delete']) )
+if ( isset( $_GET['action'] ) && $_GET['action'] == 'delete' && isset($_GET['delete']) )
     $action = 'bulk-delete';
 
@@ -155 +155 @@
 
 <?php
-$pagenum = absint( $_GET['pagenum'] );
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
 if ( empty($pagenum) )
     $pagenum = 1;
-if( !$catsperpage || $catsperpage < 0 )
+if( ! isset( $catsperpage ) || $catsperpage < 0 )
     $catsperpage = 20;
 

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

@@ -6 +6 @@
  * @subpackage Administration
  */
+
+/**
+ * @var object
+ */
+if ( ! isset( $category ) )
+    $category = (object) array();
 
 if ( ! empty($cat_ID) ) {
@@ -25 +31 @@
     do_action('add_category_form_pre', $category);
 }
+
+/**
+ * @ignore
+ * @since 2.7
+ * @internal Used to prevent errors in page when no category is being edited.
+ *
+ * @param object $category
+ */
+function _fill_empty_category(&$category) {
+    if ( ! isset( $category->name ) )
+        $category->name = '';
+
+    if ( ! isset( $category->slug ) )
+        $category->slug = '';
+
+    if ( ! isset( $category->parent ) )
+        $category->parent = '';
+
+    if ( ! isset( $category->description ) )
+        $category->description = '';
+}
+
+_fill_empty_category($category);
 ?>
 

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

@@ -370 +370 @@
 </p>
 <h4><?php _e( 'Post Password' ); ?></h4>
-<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 ); ?>" /></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

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

@@ -96 +96 @@
 
 <?php
-$pagenum = absint( $_GET['pagenum'] );
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
 if ( empty($pagenum) )
     $pagenum = 1;
-if( !$catsperpage || $catsperpage < 0 )
+if( ! isset( $catsperpage ) || $catsperpage < 0 )
     $catsperpage = 20;
 

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

@@ -6 +6 @@
  * @subpackage Administration
  */
+
+/**
+ * @var object
+ */
+if ( ! isset( $category ) )
+    $category = (object) array();
 
 if ( ! empty($cat_ID) ) {
@@ -25 +31 @@
     do_action('add_link_category_form_pre', $category);
 }
+
+/**
+ * @ignore
+ * @since 2.7
+ * @internal Used to prevent errors in page when no category is being edited.
+ *
+ * @param object $category
+ */
+function _fill_empty_link_category(&$category) {
+    if ( ! isset( $category->name ) )
+        $category->name = '';
+
+    if ( ! isset( $category->slug ) )
+        $category->slug = '';
+
+    if ( ! isset( $category->description ) )
+        $category->description = '';
+}
+
+_fill_empty_link_category($category);
 ?>
 

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

@@ -37 +37 @@
         <tr class="form-field form-required">
             <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
-            <td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
+            <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
             <p><?php _e('The name is how the tag appears on your site.'); ?></p></td>
         </tr>
         <tr class="form-field">
             <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
-            <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
+            <td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" 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></td>
         </tr>

trunk/wp-admin/edit-tags.php

@@ -14 +14 @@
 wp_reset_vars(array('action', 'tag'));
 
-if ( $_GET['action'] == 'delete' && isset($_GET['delete_tags']) )
+if ( isset( $_GET['action'] ) && $_GET['action'] == 'delete' && isset($_GET['delete_tags']) )
     $action = 'bulk-delete';
 
@@ -162 +162 @@
 
 <?php
-$pagenum = absint( $_GET['pagenum'] );
+$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
 if ( empty($pagenum) )
     $pagenum = 1;
-if( !$tagsperpage || $tagsperpage < 0 )
+if( ! isset( $tagsperpage ) || $tagsperpage < 0 )
     $tagsperpage = 20;
 
@@ -202 +202 @@
 <?php
 
-$searchterms = trim( $_GET['s'] );
+$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
 
 $count = tag_rows( $pagenum, $tagsperpage, $searchterms );

trunk/wp-admin/includes/user.php

@@ -231 +231 @@
     $user->display_name = attribute_escape($user->display_name);
     $user->nickname     = attribute_escape($user->nickname);
-    $user->aim          = attribute_escape($user->aim);
-    $user->yim          = attribute_escape($user->yim);
-    $user->jabber       = attribute_escape($user->jabber);
-    $user->description  =  wp_specialchars($user->description);
+    $user->aim          = isset( $user->aim ) && !empty( $user->aim ) ? attribute_escape($user->aim) : '';
+    $user->yim          = isset( $user->yim ) && !empty( $user->yim ) ? attribute_escape($user->yim) : '';
+    $user->jabber       = isset( $user->jabber ) && !empty( $user->jabber ) ? attribute_escape($user->jabber) : '';
+    $user->description  = isset( $user->description ) && !empty( $user->description ) ? wp_specialchars($user->description) : '';
 
     return $user;

trunk/wp-admin/includes/widgets.php

@@ -60 +60 @@
                 continue;
 
+            if ( ! isset( $widget['params'][0] ) )
+                $widget['params'][0] = array();
             ob_start();
-                $args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template', '_show' => $show ), 1 => $widget['params'][0] ) );
-                $sidebar_args = call_user_func_array( 'wp_widget_control', $args );
+            $args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template', '_show' => $show ), 1 => $widget['params'][0] ) );
+            $sidebar_args = call_user_func_array( 'wp_widget_control', $args );
             $widget_control_template = ob_get_contents();
             ob_end_clean();
@@ -231 +233 @@
 
     $id_format = $widget['id'];
+
+    if ( ! isset( $sidebar_args['_show'] ) )
+        $sidebar_args['_show'] = '';
+
+    if ( ! isset( $sidebar_args['_display'] ) )
+        $sidebar_args['_display'] = '';
+
     // We aren't showing a widget control, we're outputing a template for a mult-widget control
     if ( 'all' == $sidebar_args['_show'] && 'template' == $sidebar_args['_display'] && isset($control['params'][0]['number']) ) {

trunk/wp-admin/menu.php

@@ -125 +125 @@
         }
         unset($submenu[$old_parent]);
-        $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+
+        if ( isset($_wp_submenu_nopriv[$old_parent]) )
+            $_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
     }
 }

trunk/wp-admin/upload.php

@@ -178 +178 @@
     // Use $_GET instead of is_ since they can override each other
     $h2_author = '';
-    $_GET['author'] = (int) $_GET['author'];
+    $_GET['author'] = isset( $_GET['author'] ) ? (int) $_GET['author'] : 0;
     if ( $_GET['author'] != 0 ) {
         if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion

trunk/wp-admin/user-edit.php

@@ -158 +158 @@
 </div>
 <?php endif; ?>
-<?php if ( is_wp_error( $errors ) ) : ?>
+<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
 <div class="error">
     <ul>

trunk/wp-includes/feed.php

@@ -495 +495 @@
 function self_link() {
     echo 'http'
-        . ( $_SERVER['https'] == 'on' ? 's' : '' ) . '://'
+        . ( (isset($_SERVER['https']) && $_SERVER['https'] == 'on') ? 's' : '' ) . '://'
         . $_SERVER['HTTP_HOST']
         . wp_specialchars(stripslashes($_SERVER['REQUEST_URI']), 1);

trunk/wp-includes/functions.php

@@ -803 +803 @@
 function make_url_footnote( $content ) {
     preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
-    $j = 0;
+    $links_summary = "\n";
     for ( $i=0; $i<count($matches[0]); $i++ ) {
-        $links_summary = ( !$j ) ? "\n" : $links_summary;
-        $j++;
         $link_match = $matches[0][$i];
         $link_number = '['.($i+1).']';

trunk/wp-includes/taxonomy.php

@@ -716 +716 @@
         $cache[ $key ] = array();
         wp_cache_set( 'get_terms', $cache, 'terms' );
-        return apply_filters('get_terms', array(), $taxonomies, $args);
+        $terms = apply_filters('get_terms', array(), $taxonomies, $args);
+        return $terms;
     }