summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-01-29 19:00:03 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-01-29 19:00:03 +0100
commit878cd70078c579f6c0ce8ad2e311518c8a688d17 (patch)
tree333d8f4e2dd33c04019f998ed5095d3f51d65e06
parent0975bcc8d56392af3d07f1e2af941b727d6dc389 (diff)
Fixed a bug (#2858) which referenced a wrong variable in the Image class.
-rw-r--r--system/libraries/Image_lib.php4
-rw-r--r--user_guide/changelog.html1
2 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 9a78adf62..239865b9d 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -473,7 +473,9 @@ class CI_Image_lib {
// If the target width/height match the source, AND if
// the new file name is not equal to the old file name
// we'll simply make a copy of the original with the new name
- if (($this->orig_width == $this->width AND $this->orig_height == $this->height) AND ($this->source_image != $this->dest_image))
+ if (($this->orig_width == $this->width AND $this->orig_height == $this->height) AND ($this->source_image != $this->new_image))
+
+
{
if ( ! @copy($this->full_src_path, $this->full_dst_path))
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index ad6240946..645d5ae01 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -162,6 +162,7 @@ Change Log
<li>Removed an extraneous call to loading models (#3286).</li>
<li>Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).</li>
<li>Removed an unused parameter from Profiler (#3332).</li>
+ <li>Fixed a bug (#2858) which referenced a wrong variable in the Image class.</li>
<li>Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.</li>
<li>Fixed a bug (#3328) where the smiley helper might return an undefined variable.</li>
<li>Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.</li>