git://git.onelab.eu
/
www-register-wizard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to codeigniter 1.7.2 for f12
[www-register-wizard.git]
/
codeigniter
/
CodeIgniter.php
diff --git
a/codeigniter/CodeIgniter.php
b/codeigniter/CodeIgniter.php
index
fa4bf77
..
dac137b
100644
(file)
--- a/
codeigniter/CodeIgniter.php
+++ b/
codeigniter/CodeIgniter.php
@@
-6,7
+6,7
@@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2008, EllisLab, Inc.
+ * @copyright Copyright (c) 2008
- 2009
, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@
-28,7
+28,7
@@
*/
// CI Version
*/
// CI Version
-define('CI_VERSION', '1.7.
0
');
+define('CI_VERSION', '1.7.
2
');
/*
* ------------------------------------------------------
/*
* ------------------------------------------------------
@@
-57,7
+57,11
@@
require(APPPATH.'config/constants'.EXT);
* ------------------------------------------------------
*/
set_error_handler('_exception_handler');
* ------------------------------------------------------
*/
set_error_handler('_exception_handler');
-set_magic_quotes_runtime(0); // Kill magic quotes
+
+if ( ! is_php('5.3'))
+{
+ @set_magic_quotes_runtime(0); // Kill magic quotes
+}
/*
* ------------------------------------------------------
/*
* ------------------------------------------------------
@@
-130,7
+134,7
@@
$LANG =& load_class('Language');
* Note: The Loader class needs to be included first
*
*/
* Note: The Loader class needs to be included first
*
*/
-if (
floor(phpversion()) < 5
)
+if (
! is_php('5.0.0')
)
{
load_class('Loader', FALSE);
require(BASEPATH.'codeigniter/Base4'.EXT);
{
load_class('Loader', FALSE);
require(BASEPATH.'codeigniter/Base4'.EXT);