Changeset 1735

Timestamp:

01/20/2008 09:20:15 AM (12 months ago)

Author:

Shadowhand

Message:

Fixing #326.

Files:

• trunk/system/core/Kohana.php (modified) (3 diffs)

trunk/system/core/Kohana.php

@@ -380 +380 @@
                 );
 
-                if ($level = Config::item('core.output_compression'))
+                if (ini_get('output_handler') != 'ob_gzhandler' AND ini_get('zlib.output_compression') == 0 AND $level = Config::item('core.output_compression'))
                 {
                         if ($level < 1 OR $level > 9)
@@ -582 +582 @@
         public static function auto_load($class)
         {
+                static $prefix;
+
+                // Set the extension prefix
+                empty($prefix) and $prefix = Config::item('core.extension_prefix');
+
                 if (class_exists($class, FALSE))
                         return TRUE;
 
-                $type = strrpos($class, '_');
-
-                if ($type !== FALSE)
-                {
+                if (($type = strrpos($class, '_')) !== FALSE)
+                {
+                        // Find the class suffix
                         $type = substr($class, $type + 1);
                 }
@@ -630 +634 @@
                 if ($type === 'libraries' OR $type === 'helpers')
                 {
-                        if ($extension = self::find_file($type, Config::item('core.extension_prefix').$class))
-                        {
-                                require $extension;
-                        }
-                        elseif (substr($class, -5) !== '_Core' AND class_exists($class.'_Core', TRUE))
-                        {
+                        if ($extension = self::find_file($type, $prefix.$class))
+                        {
+                                // Load the class extension
+                                require_once $extension;
+                        }
+                        elseif (substr($class, -5) !== '_Core' AND class_exists($class.'_Core', FALSE))
+                        {
+                                // Transparent class extensions are handled using eval. This is
+                                // a disgusting hack, but it works very well.
                                 eval('class '.$class.' extends '.$class.'_Core { }');
                         }