<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13860] trunk: Fix image_resize() dependencies by moving wp_load_image()
from admin includes to wp-includes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13860">13860</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-28 03:39:00 +0000 (Sun, 28 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix image_resize() dependencies by moving wp_load_image() from admin includes to wp-includes. Fixes <a href="http://trac.wordpress.org/ticket/7279">#7279</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (13859 => 13860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2010-03-28 03:28:52 UTC (rev 13859)
+++ trunk/wp-admin/includes/image.php 2010-03-28 03:39:00 UTC (rev 13860)
</span><span class="lines">@@ -138,34 +138,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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;
-}
-
-/**
</del><span class="cx"> * Calculated the new dimentions for a downsampled image.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (13859 => 13860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-03-28 03:28:52 UTC (rev 13859)
+++ trunk/wp-includes/media.php 2010-03-28 03:39:00 UTC (rev 13860)
</span><span class="lines">@@ -231,6 +231,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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;
+}
+
+/**
</ins><span class="cx"> * Calculates the new dimentions for a downsampled image.
</span><span class="cx"> *
</span><span class="cx"> * If either width or height are empty, no constraint is applied on
</span></span></pre>
</div>
</div>
</body>
</html>