From 33578d209c8cc8a8bce5ccc6f289b6ada9d03adb Mon Sep 17 00:00:00 2001 From: Vivek Dinesh Date: Thu, 6 Feb 2014 09:46:07 +0530 Subject: Typo Fix Signed-off-by: Vivek Dinesh --- system/database/DB_query_builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 8223baac1..ef690090f 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -263,7 +263,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $select = explode(',', $select); } - // If the escape value was not set will will base it on the global setting + // If the escape value was not set, we will base it on the global setting is_bool($escape) OR $escape = $this->_protect_identifiers; foreach ($select as $val) -- cgit v1.2.3-24-g4f1b From e9b9beee4dc811a9620dc4808c5aae9a9e9ff35d Mon Sep 17 00:00:00 2001 From: Vivek Dinesh Date: Fri, 7 Feb 2014 12:44:29 +0530 Subject: Typo Fix Signed-off-by: Vivek Dinesh --- system/helpers/file_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 0587740b1..40c290147 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -298,7 +298,7 @@ if ( ! function_exists('get_file_info')) $fileinfo['readable'] = is_readable($file); break; case 'writable': - // There are known problems using is_weritable on IIS. It may not be reliable - consider fileperms() + // There are known problems using is_writable on IIS. It may not be reliable - consider fileperms() $fileinfo['writable'] = is_writable($file); break; case 'executable': -- cgit v1.2.3-24-g4f1b From 03077f9ab1408d28b5b9783355d1629eda3ff5ae Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 7 Feb 2014 14:53:39 +0200 Subject: Use is_really_writable() in get_file_info() --- system/helpers/file_helper.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 0587740b1..ae3db5846 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -298,8 +298,7 @@ if ( ! function_exists('get_file_info')) $fileinfo['readable'] = is_readable($file); break; case 'writable': - // There are known problems using is_weritable on IIS. It may not be reliable - consider fileperms() - $fileinfo['writable'] = is_writable($file); + $fileinfo['writable'] = is_really_writable($file); break; case 'executable': $fileinfo['executable'] = is_executable($file); -- cgit v1.2.3-24-g4f1b From c697a3bfdfc301718058a09fd5692fbecee6920a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 7 Feb 2014 15:11:56 +0200 Subject: Use is_really_writable() in captcha helper --- system/helpers/captcha_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php index 24cd53568..b61b2d5cf 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_writeable($img_path) + OR ! @is_dir($img_path) OR ! is_really_writable($img_path) OR ! extension_loaded('gd')) { return FALSE; -- cgit v1.2.3-24-g4f1b