From bf6510abd13f120d24d2d52d21fa4ac0fa92bcc0 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 28 Mar 2010 03:39:00 +0000
Subject: [PATCH] Fix image_resize() dependencies by moving wp_load_image()
 from admin includes to wp-includes. Fixes #7279

git-svn-id: http://svn.automattic.com/wordpress/trunk@13860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/image.php | 28 ----------------------------
 wp-includes/media.php       | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index f5aeb480c..44329c013 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -137,34 +137,6 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 	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 &#8220;%s&#8221; doesn&#8217;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 &#8220;%s&#8221; is not an image.'), $file);
-
-	return $image;
-}
-
 /**
  * Calculated the new dimentions for a downsampled image.
  *
diff --git a/wp-includes/media.php b/wp-includes/media.php
index a2ff679f6..c6a35fa68 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -230,6 +230,34 @@ function get_image_tag($id, $alt, $title, $align, $size='medium') {
 	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 &#8220;%s&#8221; doesn&#8217;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 &#8220;%s&#8221; is not an image.'), $file);
+
+	return $image;
+}
+
 /**
  * Calculates the new dimentions for a downsampled image.
  *