Changeset 823

Timestamp:

12/11/06 11:45:03 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 4640

Files:

• trunk/wp-admin/admin-db.php (modified) (5 diffs)
• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/upload-functions.php (modified) (1 diff)
• trunk/wp-commentsrss2.php (modified) (1 diff)
• trunk/wp-includes/category.php (modified) (3 diffs)
• trunk/wp-includes/comment.php (modified) (2 diffs)
• trunk/wp-includes/functions.php (modified) (4 diffs)
• trunk/wp-includes/general-template.php (modified) (2 diffs)
• trunk/wp-includes/js/crop (added)
• trunk/wp-includes/js/crop/cropper.css (added)
• trunk/wp-includes/js/crop/cropper.js (added)
• trunk/wp-includes/js/crop/marqueeHoriz.gif (added)
• trunk/wp-includes/js/crop/marqueeVert.gif (added)
• trunk/wp-includes/post.php (modified) (6 diffs)
• trunk/wp-includes/query.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (1 diff)

trunk/wp-admin/admin-db.php

@@ -139 +139 @@
-        }
-
-
-
+
+
+
+
+
+
-
-        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;
@@ -178 +180 @@
-
-        $cat_ID = (int) $cat_ID;
-
-
-
+
+
+
+
+
-                return 0;
-
-        if ( $cat_ID == get_option('default_link_category') )
-                return 0;
-
-        $category = get_category($cat_ID);
-
-        $parent = $category->category_parent;
-
-.
+
-        if ( !$wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'") )
-                return 0;
-
-.
+
-        $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
-
-
-
+
-        $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) )
@@ -209 +209 @@
-        }
-
-        $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) )
@@ -220 +219 @@
-        }
-
-
-
-
-
+
-        do_action('delete_category', $cat_ID);
-
-        return 1;
-}
@@ -493 +488 @@
-        }
-
-        do_action('edit_link', $link_ID);
-}       // wp_set_link_cats()
-

trunk/wp-admin/admin-functions.php

@@ -864 +864 @@
-        } else {
-                return false;
-        }
-}
-
-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;
-        }
-}
@@ -2093 +1998 @@
-
-
-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;

trunk/wp-admin/upload-functions.php

@@ -221 +221 @@
-                $id = wp_insert_attachment($attachment, $file, $post_id);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-                wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=browse&action=view&ID=$id&post_id=$post_id");

trunk/wp-commentsrss2.php

@@ -77 +77 @@
-                        <?php
-                        } // close check for password
+                        do_action('commentrss2_item', $comment->comment_ID, $comment->comment_post_ID);
-                        ?>
-        </item>

trunk/wp-includes/category.php

@@ -112 +112 @@
-        if ( $hierarchical ) {
-                foreach ( $categories as $k => $category ) {
-
+'link' == $type ? $category->link_count : 
-                        if ( $children = _get_cat_children($category->cat_ID, $categories) ) {
-                                foreach ( $children as $child )
-
+'link' == $type ? $child->link_count : 
-                        }
-                        if ( !$progeny && $hide_empty )
-                                unset($categories[$k]);
-                        else
-category_count
+{'link' == $type ? 'link_count' : 'category_count'}
-                }
-        }
@@ -130 +130 @@
-        return apply_filters('get_categories', $categories, $r);
-}
-
-function delete_get_categories_cache() {
-        wp_cache_delete('get_categories', 'category');
-}
-add_action( 'wp_insert_post', 'delete_get_categories_cache' );
-add_action( 'edit_category', 'delete_get_categories_cache' );
-add_action( 'add_category', 'delete_get_categories_cache' );
-add_action( 'delete_category', 'delete_get_categories_cache' );
-
-// Retrieves category data given a category ID or category object.
@@ -178 +170 @@
-        $leaf_path  = sanitize_title(basename($category_paths));
-        $category_paths = explode('/', $category_paths);
-
-
+
+
+
-
-        $categories = $wpdb->get_results("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE category_nicename = '$leaf_path'");

trunk/wp-includes/comment.php

@@ -433 +433 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
+
-                return false;
-
+
+
+
+
+
-}
-
@@ -493 +488 @@
-        $wpdb->query("UPDATE $wpdb->posts SET comment_count = $count WHERE ID = '$post_id'");
-        $comment_count_cache[$post_id] = $count;
+
+        $post = get_post($post_id);
+        if ( 'page' == $post->post_type )
+                clean_page_cache( $post_id );
+        else
+                clean_post_cache( $post_id );
+
+        do_action('edit_post', $post_id);
+
-        return true;
-}

trunk/wp-includes/functions.php

@@ -537 +537 @@
-
-function clean_post_cache($id) {
-
+post_meta_cache, $category_cache, $
-
-        if ( isset( $post_cache[$blog_id][$id] ) )
-                unset( $post_cache[$blog_id][$id] );
+
+        if ( isset ($post_meta_cache[$blog_id][$id] ) )
+                unset( $post_meta_cache[$blog_id][$id] );
+
+        if ( isset( $category_cache[$blog_id][$id]) )
+                unset ( $category_cache[$blog_id][$id] );
-}
-
@@ -555 +561 @@
-}
-
-
-function clean_page_cache($id) {
-wpdb, $
+
-
-        if ( isset( $page_cache[$blog_id][$id] ) )
-                unset( $page_cache[$blog_id][$id] );
-
-$page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type='page'"
-'all_page_ids','pages'
-
+wp_cache_delete($id, 'pages'
+ 'all_page_ids', 'pages' 
+wp_cache_delete( 'get_pages', 'page' );
-}
-
@@ -669 +674 @@
-function update_category_cache() {
-        return true;
+}
+
+function clean_category_cache($id) {
+        wp_cache_delete($id, 'category');
+        wp_cache_delete('all_category_ids', 'category');
+        wp_cache_delete('get_categories', 'category');
-}
-
@@ -1118 +1129 @@
-}
-
+function wp_generate_attachment_metadata( $attachment_id, $file ) {
+        $attachment = get_post( $attachment_id );
+
+        $metadata = array();
+        if ( preg_match('!^image/!', get_post_mime_type( $attachment )) ) {
+                $imagesize = getimagesize($file);
+                $metadata['width'] = $imagesize['0'];
+                $metadata['height'] = $imagesize['1'];
+                list($uwidth, $uheight) = get_udims($metadata['width'], $metadata['height']);
+                $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
+                $metadata['file'] = $file;
+
+                if ( $metadata['width'] * $metadata['height'] < 3 * 1024 * 1024 ) {
+                        if ( $metadata['width'] > 128 && $metadata['width'] >= $metadata['height'] * 4 / 3 )
+                                $thumb = wp_create_thumbnail($file, 128);
+                        elseif ( $metadata['height'] > 96 )
+                                $thumb = wp_create_thumbnail($file, 96);
+
+                        if ( @file_exists($thumb) )
+                                $metadata['thumb'] = basename($thumb);
+                }
+        }
+        return apply_filters( 'wp_generate_attachment_metadata', $metadata );
+}
+
+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;
+        }
+}
+
-function wp_explain_nonce($action) {
-        if ( $action !== -1 && preg_match('/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches) ) {

trunk/wp-includes/general-template.php

@@ -369 +369 @@
-                        foreach ( $arcresults as $arcresult ) {
-                                $url    = get_day_link($arcresult->year, $arcresult->month, $arcresult->dayofmonth);
-__('%1$d-%2$02d-%3$02d 00:00:00')
+'%1$d-%2$02d-%3$02d 00:00:00'
-                                $text = mysql2date($archive_day_date_format, $date);
-                                if ($show_post_count)
@@ -389 +389 @@
-                                                $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
-                                                $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
-__('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d')
+'%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d'
-                                                $text = $arc_week_start . $archive_week_separator . $arc_week_end;
-                                                if ($show_post_count)

trunk/wp-includes/post.php

@@ -439 +439 @@
-
-        if ( 'page' == $post->post_type ) {
-
-
+
-                $wp_rewrite->flush_rules();
-        }
@@ -653 +652 @@
-        if ( 'page' == $post_type ) {
-                clean_page_cache($post_ID);
-wp_cache_delete($post_ID, 'pages'
+$wp_rewrite->flush_rules(
-        } else {
-                clean_post_cache($post_ID);
@@ -692 +691 @@
-                }
-        } else if ($post_type == 'page') {
-                wp_cache_delete( 'all_page_ids', 'pages' );
-                wp_cache_delete( 'get_pages', 'page' );
-                $wp_rewrite->flush_rules();
-
-                if ( !empty($page_template) )
-                        if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template))
@@ -819 +814 @@
-                $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$cat_id'");
-                $wpdb->query("UPDATE $wpdb->categories SET category_count = '$count' WHERE cat_ID = '$cat_id'");
-wp_cache_delete($cat_id, 'category'
+clean_category_cache($cat_id
-                do_action('edit_category', $cat_id);
-        }
-
-        wp_cache_delete('get_categories', 'category');
-
-        do_action('edit_post', $post_ID);
-}       // wp_set_post_categories()
-
@@ -1164 +1155 @@
-        return $pages;
-}
-
-function delete_get_pages_cache() {
-        wp_cache_delete( 'get_pages', 'page' );
-}
-add_action( 'save_post', 'delete_get_pages_cache' );
-
-function generate_page_uri_index() {
@@ -1440 +1426 @@
-}
-
+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;
+}
+
-?>

trunk/wp-includes/query.php

@@ -820 +820 @@
-                        $q['category_name'] = sanitize_title(basename($cat_paths));
-                        $cat_paths = explode('/', $cat_paths);
-
-
+
+
+
-
-                        //if we don't match the entire hierarchy fallback on just matching the nicename

trunk/wp-includes/script-loader.php

@@ -23 +23 @@
-                $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4459');
-                $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4583');
+                $this->add( 'scriptaculous', '/wp-includes/js/scriptaculous/scriptaculous.js', array('prototype'), '1.6.1');
+                $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/scriptaculous.js?load=builder,dragdrop', array('prototype'), '1.6.1');
+                $this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/scriptaculous.js?load=slider,effects', array('prototype'), '1.6.1');
+                $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/scriptaculous.js?load=controls', array('prototype'), '1.6.1');
+                $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '1');
-                if ( is_admin() ) {
-                        $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );

trunk/xmlrpc.php

@@ -883 +883 @@
-                // Save the data
-                $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
-array(
+wp_generate_attachment_metadata( $id, $upload['file'] 
-
-                return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );