summaryrefslogtreecommitdiffstats
path: root/system/core/Common.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-10 21:04:29 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-10 21:04:29 +0100
commit189a34ec0949c6e96c896b92a8b1ea09ae9f232c (patch)
treeddb25a94de1095598e1b88bc2d082552cef392e5 /system/core/Common.php
parent3c7c461a93145b045ba688585a5b606e28b7d7cb (diff)
parentb790371f328e49ed57eda85bf33817e033b85601 (diff)
Merge upstream branch
Diffstat (limited to 'system/core/Common.php')
-rw-r--r--system/core/Common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 6ef229629..2f9c4ff43 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -199,7 +199,7 @@ if ( ! function_exists('load_class'))
*/
if ( ! function_exists('is_loaded'))
{
- function is_loaded($class = '')
+ function &is_loaded($class = '')
{
static $_is_loaded = array();
@@ -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';
}