diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index ef716c3df1..444985a35b 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -345,7 +345,7 @@ $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
 <div id="descriptiondiv" class="stuffbox">
 <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>
 </div>
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 95b90cbf99..8c8a79c62c 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -939,7 +939,7 @@ function media_upload_form( $errors = null ) {
 		$flash = false;
 
 	$flash = apply_filters('flash_uploader', $flash);
-	$post_id = intval($_REQUEST['post_id']);
+	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
 
 ?>
 <div id="media-upload-notice">
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 9d275f136e..5823932dcc 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -141,7 +141,7 @@ function _cat_row( $category, $level, $name_override = false ) {
 	return apply_filters('cat_row', $output);
 }
 
-function link_cat_row( $category ) {
+function link_cat_row( $category, $name_override = false ) {
 	global $class;
 
 	if ( !$category = get_term( $category, 'link_category' ) )
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 60550a419f..914c0c8354 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -231,7 +231,7 @@ $messages[3] = __('Error saving media attachment.');
 if ( isset($_GET['message']) && (int) $_GET['message'] )
 	$message = $messages[$_GET['message']];
 
-if ( $message ) { ?>
+if ( isset($message) ) { ?>
 <div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }