From 6871d95930a148722f2b99fa80ef6dd44f86f078 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 4 Oct 2006 00:36:18 +0000 Subject: --- system/codeigniter/Base4.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'system/codeigniter') diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php index 5d945c26a..eccf58ed8 100644 --- a/system/codeigniter/Base4.php +++ b/system/codeigniter/Base4.php @@ -20,9 +20,9 @@ * * This file is used only when Code Igniter is being run under PHP 4. * Since PHP 4 has such poor object handling we had to come up with - * a hack to resolve some scoping problems. PHP 5 doesn't suffer from - * this problem so we load one of two files based on the version of - * PHP being run. + * a hack (and a really ugly one at that...) to resolve some scoping + * problems. PHP 5 doesn't suffer from this problem so we load one of + * two files based on the version of PHP being run. * * @package CodeIgniter * @subpackage codeigniter @@ -45,14 +45,7 @@ function &get_instance() { global $OBJ, $CI; - if (is_object($CI)) - { - return $CI; - } - else - { - return $OBJ->load; - } + return (is_object($CI)) ? $CI : $OBJ->load; } ?> \ No newline at end of file -- cgit v1.2.3-24-g4f1b