Changeset 13860

Timestamp:

03/28/2010 03:39:00 AM (15 years ago)

Author:

dd32

Message:

Fix image_resize() dependencies by moving wp_load_image() from admin includes to wp-includes. Fixes #7279

Location:

trunk

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -136 +136 @@
 
     return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
-}
-
-/**
- * Load an image from a string, if PHP supports it.
- *
- * @since 2.1.0
- *
- * @param string $file Filename of the image to load.
- * @return resource The resulting image resource on success, Error string on failure.
- */
-function wp_load_image( $file ) {
-    if ( is_numeric( $file ) )
-        $file = get_attached_file( $file );
-
-    if ( ! file_exists( $file ) )
-        return sprintf(__('File “%s” doesn’t exist?'), $file);
-
-    if ( ! function_exists('imagecreatefromstring') )
-        return __('The GD image library is not installed.');
-
-    // 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 ) )
-        return sprintf(__('File “%s” is not an image.'), $file);
-
-    return $image;
 }
 

trunk/wp-includes/media.php

@@ -229 +229 @@
 
     return $html;
+}
+
+/**
+ * Load an image from a string, if PHP supports it.
+ *
+ * @since 2.1.0
+ *
+ * @param string $file Filename of the image to load.
+ * @return resource The resulting image resource on success, Error string on failure.
+ */
+function wp_load_image( $file ) {
+    if ( is_numeric( $file ) )
+        $file = get_attached_file( $file );
+
+    if ( ! file_exists( $file ) )
+        return sprintf(__('File “%s” doesn’t exist?'), $file);
+
+    if ( ! function_exists('imagecreatefromstring') )
+        return __('The GD image library is not installed.');
+
+    // 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 ) )
+        return sprintf(__('File “%s” is not an image.'), $file);
+
+    return $image;
 }