Ticket #5607: remove_admin_notices11.diff

wp-admin/edit-link-form.php

@@ -14 +14 @@
 function xfn_check($class, $value = '', $deprecated = '') {
         global $link;
 
-        $link_rel = $link->link_rel;
+        $link_rel = ( isset($link->link_rel) ) ? $link->link_rel : null;
         $rels = preg_split('/\s+/', $link_rel);
 
         if ('' != $value && in_array($value, $rels) ) {
@@ -51 +51 @@
 <h3 class="dbx-handle"><?php _e('Target') ?></h3>
 <div class="dbx-content">
 <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>
 <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>
 <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>
 </div>
 </fieldset>
@@ -84 +84 @@
 </tr>
 <tr>
 <th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('Address:') ?></label></th>
-<td width="80%"><input type="text" name="link_url" id="link_url" value="<?php echo $link->link_url; if ( empty( $link->link_url ) ) echo 'http://'; ?>" style="width: 95%" /></td>
+<td width="80%"><input type="text" name="link_url" id="link_url" value="<?php echo ( empty( $link->link_url ) ) ? 'http://' : $link->link_url; ?>" style="width: 95%" /></td>
 </tr>
 <tr>
 <th scope="row" valign="top"><label for="link_description"><?php _e('Description:') ?></label></th>
-<td><input type="text" name="link_description" id="link_description" value="<?php echo $link->link_description; ?>" style="width: 95%" /></td>
+<td><input type="text" name="link_description" id="link_description" value="<?php echo ( ! empty( $link->link_description ) ) ? $link->link_description : ''; ?>" style="width: 95%" /></td>
 </tr>
 </table>
 
@@ -104 +104 @@
 <table class="editform" width="100%" cellspacing="2" cellpadding="5">
         <tr>
                 <th width="20%" scope="row"><?php _e('rel:') ?></th>
-                <td width="80%"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
+                <td width="80%"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( ! empty($link->link_rel) ) ? $link->link_rel : ''; ?>" /></td>
         </tr>
         <tr>
                 <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
@@ -217 +217 @@
 <table class="editform" width="100%" cellspacing="2" cellpadding="5">
         <tr>
                 <th width="20%" scope="row"><?php _e('Image Address:') ?></th>
-                <td width="80%"><input type="text" name="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>
+                <td width="80%"><input type="text" name="link_image" size="50" value="<?php echo ( isset($link->link_image) ) ? $link->link_image : ''; ?>" style="width: 95%" /></td>
         </tr>
         <tr>
                 <th scope="row"><?php _e('RSS Address:') ?> </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>
                 <th scope="row"><?php _e('Notes:') ?></th>
-                <td><textarea name="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td>
+                <td><textarea name="link_notes" cols="50" rows="10" style="width: 95%"><?php echo ( isset($link->link_notes) ) ? $link->link_notes : ''; ?></textarea></td>
         </tr>
         <tr>
                 <th scope="row"><?php _e('Rating:') ?></th>
@@ -233 +233 @@
                 <?php
                         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>');
                         }