summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-01-08 23:24:32 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-01-08 23:24:32 +0100
commit2425f2f90331a014d3b276629089135fbd849a42 (patch)
tree12b8c710384aaed67dfb048c5dc1d5e74d1e2fec
parent352d60e9f3a65def29e02a4507ef742eac255333 (diff)
parent0609d588a4340fc9a9cfbc0ff76c39bba9ab09fb (diff)
Merge pull request #897 from IT-Can/develop-fixes-896
Fixes for issue #896
-rw-r--r--system/core/Common.php2
-rwxr-xr-xsystem/core/Output.php3
-rwxr-xr-xsystem/core/URI.php5
3 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 6ef229629..1f59c02d7 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -235,7 +235,7 @@ if ( ! function_exists('get_config'))
}
// Is the config file in the environment folder?
- if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT..'/config.php'))
+ if ( ! defined('ENVIRONMENT') OR ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php'))
{
$file_path = APPPATH.'config/config.php';
}
diff --git a/system/core/Output.php b/system/core/Output.php
index 1beee734f..da5c29044 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -129,7 +129,6 @@ class CI_Output {
*
* Sets the output string
*
- * @access public
* @param string
* @return void
*/
@@ -282,7 +281,7 @@ class CI_Output {
* @param integer
* @return void
*/
- publi function cache($time)
+ public function cache($time)
{
$this->cache_expiration = ( ! is_numeric($time)) ? 0 : $time;
return $this;
diff --git a/system/core/URI.php b/system/core/URI.php
index eaf7b752b..b28ee198b 100755
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -186,11 +186,12 @@ class CI_URI {
return '';
}
- if (strpos($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']) === 0)
+ $uri = $_SERVER['REQUEST_URI'];
+ if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
{
$uri = substr($uri, strlen($_SERVER['SCRIPT_NAME']));
}
- elseif (strpos($_SERVER['REQUEST_URI'], dirname($_SERVER['SCRIPT_NAME'])) === 0)
+ elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
{
$uri = substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
}