Changeset 6786

Timestamp:

02/11/2008 09:02:44 AM (19 years ago)

Author:

matt

Message:

Blow out mem limit, slightly larger thumbnails.

Location:

trunk

Files:

• wp-admin/includes/image.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/shortcodes.php (modified) (2 diffs)

trunk/wp-admin/includes/image.php

@@ -41 +41 @@
         }
 
-        @ imagecopyresampled( $thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $sourceImageWidth, $sourceImageHeight );
+        imagecopyresampled( $thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $sourceImageWidth, $sourceImageHeight );
 
         imagedestroy( $image ); // Free up memory
@@ -154 +154 @@
 
                 if ( $max < 0 || $metadata['width'] * $metadata['height'] < $max ) {
-                        $max_side = apply_filters( 'wp_thumbnail_max_side_length', 128, $attachment_id, $file );
+                        $max_side = apply_filters( 'wp_thumbnail_max_side_length', 140, $attachment_id, $file );
                         $thumb = wp_create_thumbnail( $file, $max_side );
-
                         if ( @file_exists($thumb) )
                                 $metadata['thumb'] = basename($thumb);
@@ -189 +188 @@
                 return __('The GD image library is not installed.');
 
-        $image = @imagecreatefromstring( @file_get_contents( $file ) );
+        // Set artificially high because GD uses uncompressed images in memory
+        @ini_set('memory_limit', '256M');
+        $image = imagecreatefromstring( file_get_contents( $file ) );
 
         if ( !is_resource( $image ) )

trunk/wp-includes/functions.php

@@ -1071 +1071 @@
         // separate the filename into a name and extension
         $info = pathinfo($filename);
-        $ext = strtolower( $info['extension'] );
+        $ext = $info['extension'];
         $name = basename($filename, ".{$ext}");
 
@@ -1084 +1084 @@
                         $ext = '';
                 else
-                        $ext = ".$ext";
+                        $ext = strtolower( ".$ext" );
                 $filename = $filename . $ext;
                 while ( file_exists( $dir . "/$filename" ) ) {

trunk/wp-includes/shortcodes.php

@@ -147 +147 @@
                 <style type='text/css'>
                         .gallery {
-                                width: 450px;
-                                left: 50%;
                                 margin: auto;
                         }
@@ -157 +155 @@
                                 width: 33%;                     }
                         .gallery img {
-                                border: 3px solid #cfcfcf;
+                                border: 2px solid #cfcfcf;
                         }
                 </style>