summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/codeigniter/CodeIgniter.php2
-rw-r--r--system/codeigniter/Common.php6
2 files changed, 5 insertions, 3 deletions
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 5cf7d2fdc..1671287d0 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -58,7 +58,7 @@ require(APPPATH.'config/constants'.EXT);
*/
set_error_handler('_exception_handler');
-if ( ! is_php(5.3))
+if ( ! is_php('5.3'))
{
@set_magic_quotes_runtime(0); // Kill magic quotes
}
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 1ffed6a0c..6d3202d1b 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -36,12 +36,14 @@
* we'll set a static variable.
*
* @access public
-* @return bool
+* @param string
+* * @return bool
*/
function is_php($version = '5.0.0')
{
static $_is_php;
-
+ $version = (string)$version;
+
if ( ! isset($_is_php[$version]))
{
$_is_php[$version] = (version_compare(PHP_VERSION, $version) < 0) ? FALSE : TRUE;