diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-12-14 12:07:08 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-12-14 12:07:08 +0000 |
commit | a14a6c1201b773cd2ef57a7526190ff43d20fe22 (patch) | |
tree | 630d05fff5e6f6aa36ee3d8eb5b206f102617a65 | |
parent | 040b8591582940de99442bb1de04afdf9d3daf59 (diff) | |
download | wordpress-mu-a14a6c1201b773cd2ef57a7526190ff43d20fe22.tar.gz wordpress-mu-a14a6c1201b773cd2ef57a7526190ff43d20fe22.tar.xz wordpress-mu-a14a6c1201b773cd2ef57a7526190ff43d20fe22.zip |
WP Merge to rev 4646
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@824 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r-- | wp-admin/admin-functions.php | 127 | ||||
-rw-r--r-- | wp-admin/plugins.php | 4 | ||||
-rw-r--r-- | wp-includes/functions.php | 124 | ||||
-rw-r--r-- | wp-includes/js/tinymce/themes/advanced/jscripts/link.js | 1 | ||||
-rw-r--r-- | wp-includes/link-template.php | 2 |
5 files changed, 131 insertions, 127 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index a46d608..b3fbc8b 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -2058,18 +2058,141 @@ function wp_load_image( $file ) { $file = get_attached_file( $file ); if ( !file_exists( $file ) ) - return "File '$file' doesn't exist?"; + return sprintf(__("File '%s' doesn't exist?"), $file); + + if ( ! function_exists('imagecreatefromstring') ) + return __('The GD image library is not installed.'); $contents = file_get_contents( $file ); $image = imagecreatefromstring( $contents ); if ( !is_resource( $image ) ) - return "File '$file' is not image?"; + return sprintf(__("File '%s' is not an image."), $file); return $image; } +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 autocomplete_css() { ?> <style type='text/css'> diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index d8fce65..304eb64 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -147,11 +147,11 @@ if (empty($plugins)) { } ?> -<p><?php _e(sprintf('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.', PLUGINDIR)); ?></p> +<p><?php printf(__('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), PLUGINDIR); ?></p> <h2><?php _e('Get More Plugins'); ?></h2> <p><?php _e('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>.'); ?></p> -<p><?php _e(sprintf('To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.', PLUGINDIR)); ?></p> +<p><?php printf(__('To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.'), PLUGINDIR); ?></p> </div> diff --git a/wp-includes/functions.php b/wp-includes/functions.php index a48c0af..61b553b 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -294,7 +294,7 @@ function update_option($option_name, $newvalue) { $_newvalue = $newvalue; $newvalue = maybe_serialize($newvalue); - wp_cache_delete($option_name, 'options'); + wp_cache_set($option_name, $newvalue, 'options'); $newvalue = $wpdb->escape($newvalue); $option_name = $wpdb->escape($option_name); @@ -316,7 +316,7 @@ function add_option($name, $value = '', $description = '', $autoload = 'yes') { $value = maybe_serialize($value); - wp_cache_delete($name, 'options'); + wp_cache_set($name, $value, 'options'); $name = $wpdb->escape($name); $value = $wpdb->escape($value); @@ -1128,126 +1128,6 @@ function wp_check_filetype($filename, $mimes = null) { return compact('ext', 'type'); } -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) ) { $verb = $matches[1]; diff --git a/wp-includes/js/tinymce/themes/advanced/jscripts/link.js b/wp-includes/js/tinymce/themes/advanced/jscripts/link.js index 74045bd..990b7a4 100644 --- a/wp-includes/js/tinymce/themes/advanced/jscripts/link.js +++ b/wp-includes/js/tinymce/themes/advanced/jscripts/link.js @@ -26,6 +26,7 @@ function init() { } document.forms[0].href.value = tinyMCE.getWindowArg('href') || 'http://'; + document.forms[0].href.select(); document.forms[0].linktitle.value = tinyMCE.getWindowArg('title'); document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 151a986..ef570f2 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -134,7 +134,7 @@ function get_attachment_link($id = false) { } $object = get_post($id); - if ( $wp_rewrite->using_permalinks() && ($object->post_parent > 0) ) { + if ( $wp_rewrite->using_permalinks() && ($object->post_parent > 0) && ($object->post_parent != $id) ) { $parent = get_post($object->post_parent); if ( 'page' == $parent->post_type ) $parentlink = _get_page_link( $object->post_parent ); // Ignores page_on_front |