summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-26 17:31:02 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-26 17:31:02 +0100
commitea41c8aa1951216b6a9ccc99832d69d2b41c5ead (patch)
tree57b8b39c7325217795e172cafb71e5f7e63fc563 /system/libraries
parent4247ed1c0fb588f968f18fd80a5f95debefc63f6 (diff)
Don't use error suppression on realpath() + style adjustments
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Image_lib.php4
-rw-r--r--system/libraries/Upload.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index db45a80fc..ac3db416d 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -493,9 +493,9 @@ class CI_Image_lib {
* Either way, we'll try use realpath to generate the
* full server path in order to more reliably read it.
*/
- if (function_exists('realpath') && @realpath($this->source_image) !== FALSE)
+ if (($full_source_path = realpath($this->source_image)) !== FALSE)
{
- $full_source_path = str_replace('\\', '/', realpath($this->source_image));
+ $full_source_path = str_replace('\\', '/', $full_source_path);
}
else
{
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 583a97693..62cfb28c0 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -967,7 +967,7 @@ class CI_Upload {
return FALSE;
}
- if (@realpath($this->upload_path) !== FALSE)
+ if (realpath($this->upload_path) !== FALSE)
{
$this->upload_path = str_replace('\\', '/', realpath($this->upload_path));
}