diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-26 17:41:59 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-26 17:41:59 +0100 |
| commit | 382b51383c84fbb7f861fcd87b0b71b35c9f2869 (patch) | |
| tree | 9aa8bf35189e3a7f4a8a6923bafba758d15aa90b /system/helpers | |
| parent | ea41c8aa1951216b6a9ccc99832d69d2b41c5ead (diff) | |
Don't use error suppression on is_dir(), file_exists()
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/captcha_helper.php | 2 | ||||
| -rw-r--r-- | system/helpers/directory_helper.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php index 13926774e..78eac4be0 100644 --- a/system/helpers/captcha_helper.php +++ b/system/helpers/captcha_helper.php @@ -82,7 +82,7 @@ if ( ! function_exists('create_captcha')) } if ($img_path === '' OR $img_url === '' - OR ! @is_dir($img_path) OR ! is_really_writable($img_path) + OR ! is_dir($img_path) OR ! is_really_writable($img_path) OR ! extension_loaded('gd')) { return FALSE; diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php index 84ad35894..0bbe7fe97 100644 --- a/system/helpers/directory_helper.php +++ b/system/helpers/directory_helper.php @@ -69,9 +69,9 @@ if ( ! function_exists('directory_map')) continue; } - @is_dir($source_dir.$file) && $file .= DIRECTORY_SEPARATOR; + is_dir($source_dir.$file) && $file .= DIRECTORY_SEPARATOR; - if (($directory_depth < 1 OR $new_depth > 0) && @is_dir($source_dir.$file)) + if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir.$file)) { $filedata[$file] = directory_map($source_dir.$file, $new_depth, $hidden); } |