Changeset 673

Timestamp:

10/05/2007 03:12:01 PM (12 months ago)

Author:

Shadowhand

Message:

Small changes:

• Implemented a work around for Profiler being displayed in external resources (scripts can be output with views with Profiler globally enabled)
  
• Added inflector::uncountable($str)
  

Location:

trunk

Files:

• application/config/config.php (modified) (1 diff)
• system/helpers/inflector.php (modified) (3 diffs)
• system/libraries/View.php (modified) (1 diff)

trunk/application/config/config.php

@@ -133 +133 @@
 $config['autoload'] = array
 (
-        'libraries' => 'profiler',
+        'libraries' => '',
         'models'    => ''
 );

trunk/system/helpers/inflector.php

@@ -3 +3 @@
 class inflector {
 
-        protected static $uncountables = array();
+        public static function uncountable($str)
+        {
+                static $uncountables = NULL;
+
+                if ($uncountables === NULL)
+                {
+                        // Makes a mirrored array, eg: foo => foo
+                        $uncountables = array_combine(Kohana::lang('inflector'), Kohana::lang('inflector'));
+                }
+
+                return isset($uncountables[$str]);
+        }
 
         public static function singular($str)
@@ -9 +20 @@
                 $str = trim($str);
 
-                if (empty(self::$uncountables))
-                {
-                        self::$uncountables = Kohana::lang('inflector');
-                }
-
                 // We can just return uncountable words
-                if (in_array(strtolower($str), self::$uncountables))
+                if (self::uncountable($str))
                         return $str;
 
@@ -43 +49 @@
                 $str = trim($str);
 
-                if (empty(self::$uncountables))
-                {
-                        self::$uncountables = Kohana::lang('inflector');
-                }
-
                 // We can just return uncountable words
-                if (in_array(strtolower($str), self::$uncountables))
+                if (self::uncountable($str))
                         return $str;
 

trunk/system/libraries/View.php

@@ -48 +48 @@
                         $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type);
                         $this->kohana_filetype = current(Config::item('mimes.'.$type));
+
+                        // Clear output Events to be safe
+                        Event::clear('system.output');
                 }
                 else