WP Merge to rev 4640

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@823 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 17 insertions, 173 deletions

diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php
index 27c422f..40b4556 100644
--- a/wp-admin/admin-db.php
+++ b/wp-admin/admin-db.php
@@ -138,17 +138,19 @@ function wp_insert_category($catarr) {
 		$wpdb->query( "UPDATE $wpdb->categories SET category_nicename = '$category_nicename' WHERE cat_ID = '$cat_ID'" );
 	}
 
-	wp_cache_delete($cat_ID, 'category');
-	wp_cache_delete('get_categories', 'category');
+	// Keep in mind when using this filter and altering the cat_ID that the two queries above
+	// have already taken place with the OLD cat_ID
+	// Also note that you may have post2cat entries with the old cat_ID if this is an update
+	$cat_ID = apply_filters('cat_id_filter', $cat_ID, $update);
+
+	clean_category_cache($cat_ID);
 
 	if ($update) {
 		do_action('edit_category', $cat_ID);
 	} else {
-		wp_cache_delete('all_category_ids', 'category');
 		do_action('create_category', $cat_ID);
 		do_action('add_category', $cat_ID);
 	}
-	$cat_ID = apply_filters( "cat_id_filter", $cat_ID );
 
 	return $cat_ID;
 }
@@ -177,29 +179,27 @@ function wp_delete_category($cat_ID) {
 	global $wpdb;
 
 	$cat_ID = (int) $cat_ID;
+	$default_cat = get_option('default_category');
+	$default_link_cat = get_option('default_link_category');
 
-	// Don't delete the default cat.
-	if ( $cat_ID == get_option('default_category') )
-		return 0;
-
-	if ( $cat_ID == get_option('default_link_category') )
+	// Don't delete either of the default cats
+	if ( $cat_ID == $default_cat || $cat_ID == $default_link_cat )
 		return 0;
 
 	$category = get_category($cat_ID);
 
 	$parent = $category->category_parent;
 
-	// Delete the category.
+	// Delete the category
 	if ( !$wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'") )
 		return 0;
 
-	// Update children to point to new parent.
+	// Update children to point to new parent
 	$wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
 
-	// Only set posts and links to the default category if they're not in another category already.
-	$default_cat = get_option('default_category');
+	// Only set posts and links to the default category if they're not in another category already
 	$posts = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE category_id='$cat_ID'");
-	if ( is_array($posts) ) foreach ($posts as $post_id) {
+	foreach ( (array) $posts as $post_id ) {
 		$cats = wp_get_post_categories($post_id);
 		if ( 1 == count($cats) )
 			$cats = array($default_cat);
@@ -208,9 +208,8 @@ function wp_delete_category($cat_ID) {
 		wp_set_post_categories($post_id, $cats);
 	}
 
-	$default_link_cat = get_option('default_link_category');
 	$links = $wpdb->get_col("SELECT link_id FROM $wpdb->link2cat WHERE category_id='$cat_ID'");
-	if ( is_array($links) ) foreach ($links as $link_id) {
+	foreach ( (array) $links as $link_id ) {
 		$cats = wp_get_link_cats($link_id);
 		if ( 1 == count($cats) )
 			$cats = array($default_link_cat);
@@ -219,12 +218,8 @@ function wp_delete_category($cat_ID) {
 		wp_set_link_cats($link_id, $cats);
 	}
 
-	wp_cache_delete($cat_ID, 'category');
-	wp_cache_delete('all_category_ids', 'category');
-	wp_cache_delete('get_categories', 'category');
-
+	clean_category_cache($cat_ID);
 	do_action('delete_category', $cat_ID);
-
 	return 1;
 }
 
@@ -492,7 +487,6 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
 		do_action('edit_category', $cat_id);
 	}
 
-	do_action('edit_link', $link_ID);
 }	// wp_set_link_cats()
 
 function post_exists($title, $content = '', $post_date = '') {
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 160dcc7..a46d608 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -866,101 +866,6 @@ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $le
 	}
 }
 
-function wp_create_thumbnail( $file, $max_side, $effect = '' ) {
-
-		// 1 = GIF, 2 = JPEG, 3 = PNG
-
-	if ( file_exists( $file ) ) {
-		$type = getimagesize( $file );
-
-		// if the associated function doesn't exist - then it's not
-		// handle. duh. i hope.
-
-		if (!function_exists( 'imagegif' ) && $type[2] == 1 ) {
-			$error = __( 'Filetype not supported. Thumbnail not created.' );
-		}
-		elseif (!function_exists( 'imagejpeg' ) && $type[2] == 2 ) {
-			$error = __( 'Filetype not supported. Thumbnail not created.' );
-		}
-		elseif (!function_exists( 'imagepng' ) && $type[2] == 3 ) {
-			$error = __( 'Filetype not supported. Thumbnail not created.' );
-		} else {
-
-			// create the initial copy from the original file
-			if ( $type[2] == 1 ) {
-				$image = imagecreatefromgif( $file );
-			}
-			elseif ( $type[2] == 2 ) {
-				$image = imagecreatefromjpeg( $file );
-			}
-			elseif ( $type[2] == 3 ) {
-				$image = imagecreatefrompng( $file );
-			}
-
-			if ( function_exists( 'imageantialias' ))
-				imageantialias( $image, TRUE );
-
-			$image_attr = getimagesize( $file );
-
-			// figure out the longest side
-
-			if ( $image_attr[0] > $image_attr[1] ) {
-				$image_width = $image_attr[0];
-				$image_height = $image_attr[1];
-				$image_new_width = $max_side;
-
-				$image_ratio = $image_width / $image_new_width;
-				$image_new_height = $image_height / $image_ratio;
-				//width is > height
-			} else {
-				$image_width = $image_attr[0];
-				$image_height = $image_attr[1];
-				$image_new_height = $max_side;
-
-				$image_ratio = $image_height / $image_new_height;
-				$image_new_width = $image_width / $image_ratio;
-				//height > width
-			}
-
-			$thumbnail = imagecreatetruecolor( $image_new_width, $image_new_height);
-			@ imagecopyresampled( $thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1] );
-
-			// If no filters change the filename, we'll do a default transformation.
-			if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) )
-				$thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 );
-
-			$thumbpath = str_replace( basename( $file ), $thumb, $file );
-
-			// move the thumbnail to it's final destination
-			if ( $type[2] == 1 ) {
-				if (!imagegif( $thumbnail, $thumbpath ) ) {
-					$error = __( "Thumbnail path invalid" );
-				}
-			}
-			elseif ( $type[2] == 2 ) {
-				if (!imagejpeg( $thumbnail, $thumbpath ) ) {
-					$error = __( "Thumbnail path invalid" );
-				}
-			}
-			elseif ( $type[2] == 3 ) {
-				if (!imagepng( $thumbnail, $thumbpath ) ) {
-					$error = __( "Thumbnail path invalid" );
-				}
-			}
-
-		}
-	} else {
-		$error = __( 'File not found' );
-	}
-
-	if (!empty ( $error ) ) {
-		return $error;
-	} else {
-		apply_filters( 'wp_create_thumbnail', $thumbpath );
-		return $thumbpath;
-	}
-}
-
 // Some postmeta stuff
 function has_meta( $postid ) {
 	global $wpdb;
@@ -2092,34 +1997,6 @@ function wp_reset_vars( $vars ) {
 }
 
 
-function wp_check_for_changed_slugs($post_id) {
-	if ( !strlen($_POST['wp-old-slug']) )
-		return $post_id;
-
-	$post = &get_post($post_id);
-
-	// we're only concerned with published posts
-	if ( $post->post_status != 'publish' || $post->post_type != 'post' )
-		return $post_id;
-
-	// only bother if the slug has changed
-	if ( $post->post_name == $_POST['wp-old-slug'] )
-		return $post_id;
-
-	$old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
-
-	// if we haven't added this old slug before, add it now
-	if ( !count($old_slugs) || !in_array($_POST['wp-old-slug'], $old_slugs) )
-		add_post_meta($post_id, '_wp_old_slug', $_POST['wp-old-slug']);
-
-	// if the new slug was used previously, delete it from the list
-	if ( in_array($post->post_name, $old_slugs) )
-		delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
-
-	return $post_id;
-}
-
-
 function wp_remember_old_slug() {
 	global $post;
 	$name = wp_specialchars($post->post_name); // just in case
diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php
index 11f3b77..3b093d1 100644
--- a/wp-admin/upload-functions.php
+++ b/wp-admin/upload-functions.php
@@ -220,34 +220,7 @@ function wp_upload_tab_upload_action() {
 		// Save the data
 		$id = wp_insert_attachment($attachment, $file, $post_id);
 
-		if ( preg_match('!^image/!', $attachment['post_mime_type']) ) {
-			// Generate the attachment's postmeta.
-			$imagesize = getimagesize($file);
-			$imagedata['width'] = $imagesize['0'];
-			$imagedata['height'] = $imagesize['1'];
-			list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']);
-			$imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
-			$imagedata['file'] = $file;
-
-			wp_update_attachment_metadata( $id, $imagedata );
-
-			if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
-				if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )
-					$thumb = wp_create_thumbnail($file, 128);
-				elseif ( $imagedata['height'] > 96 )
-					$thumb = wp_create_thumbnail($file, 96);
-
-				if ( @file_exists($thumb) ) {
-					$newdata = $imagedata;
-					$newdata['thumb'] = basename($thumb);
-					wp_update_attachment_metadata( $id, $newdata );
-				} else {
-					$error = $thumb;
-				}
-			}
-		} else {
-			wp_update_attachment_metadata( $id, array() );
-		}
+		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
 
 		wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=browse&action=view&ID=$id&post_id=$post_id");
 		die;