diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-04 14:34:56 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-04 14:34:56 +0200 |
| commit | 5036c9caabb12f90b9533d7fb417610e02a652ff (patch) | |
| tree | ff5fd9f6a0932e4d537482fd3ec5a3652188a950 /system/libraries/Image_lib.php | |
| parent | e4c30195c5f6dc7a144cfe4ee160b18626626612 (diff) | |
Revert/optimize some changes from 773ccc318f2769c9b7579630569b5d8ba47b114b and d261b1e89c3d4d5191036d5a5660ef6764e593a0
Diffstat (limited to 'system/libraries/Image_lib.php')
| -rw-r--r-- | system/libraries/Image_lib.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index c3973a02f..4735dfd08 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -610,8 +610,8 @@ class CI_Image_lib { } // Set the x/y coordinates - $this->x_axis = ($this->x_axis === '' OR ! preg_match('/^[0-9]+$/', $this->x_axis)) ? 0 : $this->x_axis; - $this->y_axis = ($this->y_axis === '' OR ! preg_match('/^[0-9]+$/', $this->y_axis)) ? 0 : $this->y_axis; + is_numeric($this->x_axis) OR $this->x_axis = 0; + is_numeric($this->y_axis) OR $this->y_axis = 0; // Watermark-related Stuff... if ($this->wm_overlay_path !== '') @@ -750,7 +750,7 @@ class CI_Image_lib { if ($this->gd_version() !== FALSE) { $gd_version = str_replace('0', '', $this->gd_version()); - $v2_override = ($gd_version === 2) ? TRUE : FALSE; + $v2_override = ($gd_version === 2); } } else |