Changeset 2980

Timestamp:

07/07/2008 12:50:20 PM (5 months ago)

Author:

Geert

Message:

Updated View->set() and View->set_global() to use the same internal structure. I picked the fastest one.

Location:

trunk/system

Files:

• config/mimes.php (modified) (1 diff)
• libraries/View.php (modified) (4 diffs)

trunk/system/config/mimes.php

@@ -5 +5 @@
  * A list of mime types. Our list is generally more complete and accurate than
  * the operating system MIME list.
- * 
+ *
  * If there are any missing options, please create a ticket on our issue tracker,
  * http://kohanaphp.com/trac/newticket. Be sure to give the filename and

trunk/system/libraries/View.php

@@ -98 +98 @@
         public function set($name, $value = NULL)
         {
-                if (func_num_args() === 1 AND is_array($name))
+                if (is_array($name))
                 {
                         foreach ($name as $key => $value)
@@ -109 +109 @@
                         $this->__set($name, $value);
                 }
+
                 return $this;
         }
@@ -135 +136 @@
         public function set_global($name, $value = NULL)
         {
-                if ( ! is_array($name))
-                {
-                        $name = array($name => $value);
-                }
-
-                foreach ($name as $key => $value)
-                {
-                        self::$global_data[$key] = $value;
+                if (is_array($name))
+                {
+                        foreach ($name as $key => $value)
+                        {
+                                self::$global_data[$key] = $value;
+                        }
+                }
+                else
+                {
+                        self::$global_data[$name] = $value;
                 }
 
@@ -210 +213 @@
                         $output = Kohana::$instance->_kohana_load_view($this->kohana_filename, $data);
 
-                        if ($renderer == TRUE AND is_callable($renderer, TRUE))
+                        if ($renderer !== FALSE AND is_callable($renderer, TRUE))
                         {
                                 // Pass the output through the user defined renderer