summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Config.php2
-rw-r--r--system/libraries/Loader.php4
-rw-r--r--system/libraries/Log.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index c4ea9b4ee..28409fbc4 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -44,7 +44,7 @@ class CI_Config {
*/
function CI_Config()
{
- $this->config = get_config();
+ $this->config =& get_config();
log_message('debug', "Config Class Initialized");
}
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 709d9fe3d..117626567 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -606,7 +606,7 @@ class CI_Loader {
// do a little string replacement, changing the short tags
// to standard PHP echo statements.
- if ((bool) @ini_get('short_open_tag') === FALSE)
+ if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE)
{
echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?=', '<?php echo ', file_get_contents($path))).'<?php ');
}
@@ -617,7 +617,7 @@ class CI_Loader {
log_message('debug', 'File loaded: '.$path);
- // Return the file data if requested to
+ // Return the file data if requested
if ($return === TRUE)
{
$buffer = ob_get_contents();
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index 03dc64005..b21096c50 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -42,7 +42,7 @@ class CI_Log {
*/
function CI_Log()
{
- $config = get_config();
+ $config =& get_config();
$this->log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/';