summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-05 21:29:12 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-05 21:29:12 +0200
commit24bd230337cc469941dbdb51e05351cc1b3fbe14 (patch)
tree5f2eacd7a20c361505cae89f4ee6d1f5adf5eb78 /system
parent6ef498b49946ba74d610b3805fb908b163a7f03a (diff)
Fix a magic_quotes-related bug and changed the default parameter value for is_php()
Diffstat (limited to 'system')
-rwxr-xr-xsystem/core/CodeIgniter.php2
-rw-r--r--system/core/Common.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index b3e984d4d..50eae8fb1 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -73,7 +73,7 @@
*/
set_error_handler('_exception_handler');
- if ( ! is_php('5.3'))
+ if ( ! is_php('5.4'))
{
@set_magic_quotes_runtime(0); // Kill magic quotes
}
diff --git a/system/core/Common.php b/system/core/Common.php
index 5e3b8262d..c08755c91 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -44,13 +44,13 @@ if ( ! function_exists('is_php'))
/**
* Determines if the current version of PHP is greater then the supplied value
*
- * Since there are a few places where we conditionally test for PHP > 5
+ * Since there are a few places where we conditionally test for PHP > 5.3
* we'll set a static variable.
*
* @param string
* @return bool TRUE if the current version is $version or higher
*/
- function is_php($version = '5.0.0')
+ function is_php($version = '5.3.0')
{
static $_is_php;
$version = (string) $version;