X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..849f15aeed7a5e39314057bdc0064d8edd60dd7d:/wp-admin/link.php?ds=sidebyside

diff --git a/wp-admin/link.php b/wp-admin/link.php
index 73ba2814..802745fc 100644
--- a/wp-admin/link.php
+++ b/wp-admin/link.php
@@ -10,12 +10,12 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once ('admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
+wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
 
 if ( ! current_user_can('manage_links') )
-	wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
+	wp_link_manager_disabled_message();
 
 if ( !empty($_POST['deletebookmarks']) )
 	$action = 'deletebookmarks';
@@ -24,13 +24,13 @@ if ( !empty($_POST['move']) )
 if ( !empty($_POST['linkcheck']) )
 	$linkcheck = $_POST['linkcheck'];
 
-$this_file = 'link-manager.php';
+$this_file = admin_url('link-manager.php');
 
 switch ($action) {
 	case 'deletebookmarks' :
 		check_admin_referer('bulk-bookmarks');
 
-		//for each link id (in $linkcheck[]) change category to selected value
+		// For each link id (in $linkcheck[]) change category to selected value.
 		if (count($linkcheck) == 0) {
 			wp_redirect($this_file);
 			exit;
@@ -46,32 +46,33 @@ switch ($action) {
 
 		wp_redirect("$this_file?deleted=$deleted");
 		exit;
-		break;
 
 	case 'move' :
 		check_admin_referer('bulk-bookmarks');
 
-		//for each link id (in $linkcheck[]) change category to selected value
+		// For each link id (in $linkcheck[]) change category to selected value.
 		if (count($linkcheck) == 0) {
 			wp_redirect($this_file);
 			exit;
 		}
 		$all_links = join(',', $linkcheck);
-		// should now have an array of links we can change
-		//$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+		/*
+		 * Should now have an array of links we can change:
+		 *     $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+		 */
 
 		wp_redirect($this_file);
 		exit;
-		break;
 
 	case 'add' :
 		check_admin_referer('add-bookmark');
 
-		add_link();
+		$redir = wp_get_referer();
+		if ( add_link() )
+			$redir = add_query_arg( 'added', 'true', $redir );
 
-		wp_redirect( wp_get_referer() . '?added=true' );
+		wp_redirect( $redir );
 		exit;
-		break;
 
 	case 'save' :
 		$link_id = (int) $_POST['link_id'];
@@ -81,7 +82,6 @@ switch ($action) {
 
 		wp_redirect($this_file);
 		exit;
-		break;
 
 	case 'delete' :
 		$link_id = (int) $_GET['link_id'];
@@ -91,12 +91,14 @@ switch ($action) {
 
 		wp_redirect($this_file);
 		exit;
-		break;
 
 	case 'edit' :
 		wp_enqueue_script('link');
 		wp_enqueue_script('xfn');
 
+		if ( wp_is_mobile() )
+			wp_enqueue_script( 'jquery-touch-punch' );
+
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
 		$title = __('Edit Link');
@@ -106,11 +108,10 @@ switch ($action) {
 		if (!$link = get_link_to_edit($link_id))
 			wp_die(__('Link not found.'));
 
-		include ('edit-link-form.php');
-		include ('admin-footer.php');
+		include( ABSPATH . 'wp-admin/edit-link-form.php' );
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 		break;
 
 	default :
 		break;
 }
-?>