summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsystem/core/Common.php11
-rwxr-xr-xsystem/core/URI.php5
2 files changed, 15 insertions, 1 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 07534c51f..f8d80b957 100755
--- 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/URI.php b/system/core/URI.php
index d78c8ee49..d3c25070e 100755
--- 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