diff options
Diffstat (limited to 'system')
| -rw-r--r--[-rwxr-xr-x] | system/core/Benchmark.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/CodeIgniter.php | 0 | ||||
| -rw-r--r-- | system/core/Common.php | 11 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Config.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Exceptions.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Hooks.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Input.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Lang.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Model.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Output.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Router.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/Security.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/core/URI.php | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | system/database/DB.php | 0 | ||||
| -rw-r--r-- | system/database/DB_active_rec.php | 4 |
15 files changed, 19 insertions, 5 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index a200727ab..a200727ab 100755..100644 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index e0819c801..e0819c801 100755..100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php diff --git a/system/core/Common.php b/system/core/Common.php index 07534c51f..f8d80b957 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -1,5 +1,10 @@ <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** + * MODIFIED + * config_item(): option to override returned values + */ + +/** * CodeIgniter * * An open source application development framework for PHP 5.1.6 or newer @@ -268,7 +273,7 @@ if ( ! function_exists('get_config')) */ if ( ! function_exists('config_item')) { - function config_item($item) + function config_item($item, $value = null) { static $_config_item = array(); @@ -283,6 +288,10 @@ if ( ! function_exists('config_item')) $_config_item[$item] = $config[$item]; } + if ($value !== null) { + $_config_item[$item] = $value; + } + return $_config_item[$item]; } } diff --git a/system/core/Config.php b/system/core/Config.php index 5dffbf3f2..5dffbf3f2 100755..100644 --- a/system/core/Config.php +++ b/system/core/Config.php diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 869739a5a..869739a5a 100755..100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 33f1c034c..33f1c034c 100755..100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php diff --git a/system/core/Input.php b/system/core/Input.php index 0c1f2b08e..0c1f2b08e 100755..100644 --- a/system/core/Input.php +++ b/system/core/Input.php diff --git a/system/core/Lang.php b/system/core/Lang.php index 5ac671838..5ac671838 100755..100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php diff --git a/system/core/Model.php b/system/core/Model.php index e15ffbebc..e15ffbebc 100755..100644 --- a/system/core/Model.php +++ b/system/core/Model.php diff --git a/system/core/Output.php b/system/core/Output.php index ccecafd2b..ccecafd2b 100755..100644 --- a/system/core/Output.php +++ b/system/core/Output.php diff --git a/system/core/Router.php b/system/core/Router.php index 6da667472..6da667472 100755..100644 --- a/system/core/Router.php +++ b/system/core/Router.php diff --git a/system/core/Security.php b/system/core/Security.php index b0d39b981..b0d39b981 100755..100644 --- a/system/core/Security.php +++ b/system/core/Security.php diff --git a/system/core/URI.php b/system/core/URI.php index a3ae20cc3..d3c25070e 100755..100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -1,5 +1,10 @@ <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** + * MODIFIED: + * _detect_uri(): ltrim instead of trim at the end to preserve tailing slashes + */ + +/** * CodeIgniter * * An open source application development framework for PHP 5.1.6 or newer @@ -219,7 +224,7 @@ class CI_URI { $uri = parse_url($uri, PHP_URL_PATH); // Do some final cleaning of the URI and return it - return str_replace(array('//', '../'), '/', trim($uri, '/')); + return str_replace(array('//', '../'), '/', ltrim($uri, '/')); } // -------------------------------------------------------------------- @@ -651,4 +656,4 @@ class CI_URI { // END URI Class /* End of file URI.php */ -/* Location: ./system/core/URI.php */
\ No newline at end of file +/* Location: ./system/core/URI.php */ diff --git a/system/database/DB.php b/system/database/DB.php index 8314d3b97..8314d3b97 100755..100644 --- a/system/database/DB.php +++ b/system/database/DB.php diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 129eaa7b6..4f3c46338 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -255,7 +255,7 @@ class CI_DB_active_record extends CI_DB_driver { */ public function from($from) { - foreach ((array) $from as $val) + foreach ((array)$from as $val) { if (strpos($val, ',') !== FALSE) { @@ -1647,7 +1647,7 @@ class CI_DB_active_record extends CI_DB_driver { if (strpos($table, " ") !== FALSE) { // if the alias is written with the AS keyword, remove it - $table = preg_replace('/\s+AS\s+/i', ' ', $table); + $table = preg_replace('/ AS /i', ' ', $table); // Grab the alias $table = trim(strrchr($table, " ")); |