Ticket #6670: links.patch

wp-admin/edit-link-form.php

@@ -14 +14 @@
 function xfn_check($class, $value = '', $deprecated = '') {
         global $link;
 
-        $link_rel = $link->link_rel;
+        $link_rel = @ $link->link_rel;
         $rels = preg_split('/\s+/', $link_rel);
 
         if ('' != $value && in_array($value, $rels) ) {
@@ -92 +92 @@
 <div id="descriptiondiv" class="stuffbox">
 <h3><?php _e('Description') ?></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 @ $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>
 </div>
@@ -139 +139 @@
 <h3><?php _e('Target') ?></h3>
 <div class="inside">
 <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((@ $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((@ $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((@ $link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('none') ?></label>
 <p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
 </div>
@@ -157 +157 @@
 <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
         <tr>
                 <th style="width: 20%;" scope="row"><?php _e('rel:') ?></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 @ $link->link_rel; ?>" /></td>
         </tr>
         <tr>
                 <td colspan="2">
@@ -270 +270 @@
 <table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5">
         <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 @ $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 @ $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 @ $link->link_notes; ?></textarea></td>
         </tr>
         <tr class="form-field">
                 <th valign="top"  scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
@@ -286 +286 @@
                 <?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>');
                         }

wp-admin/includes/bookmark.php

@@ -13 +13 @@
         $_POST['link_name'] = wp_specialchars( $_POST['link_name'] );
         $_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
         $_POST['link_rss'] = clean_url($_POST['link_rss']);
-        if ( 'N' != $_POST['link_visible'] )
+        if ( 'N' != @ $_POST['link_visible'] )
                 $_POST['link_visible'] = 'Y';
 
         if ( !empty( $link_id ) ) {

wp-admin/link-add.php

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

wp-admin/link-manager.php

@@ -78 +78 @@
 <h2><?php printf( __( 'Manage Links (<a href="%s">add new</a>)' ), 'link-add.php' ); ?></h2>
 
 <p id="post-search">
-        <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 attribute_escape(stripslashes( @ $_GET['s'] )); ?>" />
         <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
 </p>
 
@@ -149 +149 @@
         </thead>
         <tbody>
 <?php
+        $i = 0;
         foreach ($links as $link) {
                 $link = sanitize_bookmark($link);
                 $link->link_name = attribute_escape($link->link_name);

wp-admin/link.php

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

wp-includes/bookmark.php

@@ -247 +247 @@
                 if ( $do_object )
                         $bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
                 else
-                        $bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $bookmark['link_id'], $context);
+                        $bookmark[$field] = sanitize_bookmark_field($field, @ $bookmark[$field], $bookmark['link_id'], $context);
         }
 
         return $bookmark;