diff options
| author | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-03-21 09:59:46 +0100 |
|---|---|---|
| committer | nisheeth-barthwal <nisheeth.barthwal@nbaztec.co.in> | 2013-03-21 09:59:46 +0100 |
| commit | 76f42d9dcd42bf90c407f151d04ef207c8deebdf (patch) | |
| tree | c98568cd18540f2df23881ceed82cf9f1616d4c4 /system/libraries/Image_lib.php | |
| parent | 7d10006a0001ff0e7d82ec994b1e9cbb63683ffc (diff) | |
| parent | 13f6eabafa655828a8c09b4ae0a58a2e3776c269 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Image_lib.php')
| -rw-r--r-- | system/libraries/Image_lib.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 0cec43fc4..b6a11a3a5 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -388,7 +388,7 @@ class CI_Image_lib { */ public function clear() { - $props = array('library_path', 'source_image', 'new_image', 'width', 'height', 'rotation_angle', 'x_axis', 'y_axis', 'wm_text', 'wm_overlay_path', 'wm_font_path', 'wm_shadow_color', 'source_folder', 'dest_folder', 'mime_type', 'orig_width', 'orig_height', 'image_type', 'size_str', 'full_src_path', 'full_dst_path'); + $props = array('thumb_marker', 'library_path', 'source_image', 'new_image', 'width', 'height', 'rotation_angle', 'x_axis', 'y_axis', 'wm_text', 'wm_overlay_path', 'wm_font_path', 'wm_shadow_color', 'source_folder', 'dest_folder', 'mime_type', 'orig_width', 'orig_height', 'image_type', 'size_str', 'full_src_path', 'full_dst_path'); foreach ($props as $val) { |