diff options
Diffstat (limited to 'kohana/libraries/View.php')
| -rw-r--r-- | kohana/libraries/View.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kohana/libraries/View.php b/kohana/libraries/View.php index 5dba706c..87b15fc3 100644 --- a/kohana/libraries/View.php +++ b/kohana/libraries/View.php @@ -152,13 +152,13 @@ class View_Core { foreach ($key as $property) { // Set the result to an associative array - $result[$property] = (array_key_exists($property, $this->kohana_local_data) OR array_key_exists($property, self::$kohana_global_data)) ? TRUE : FALSE; + $result[$property] = (array_key_exists($property, $this->kohana_local_data) OR array_key_exists($property, View::$kohana_global_data)) ? TRUE : FALSE; } } else { // Otherwise just check one property - $result = (array_key_exists($key, $this->kohana_local_data) OR array_key_exists($key, self::$kohana_global_data)) ? TRUE : FALSE; + $result = (array_key_exists($key, $this->kohana_local_data) OR array_key_exists($key, View::$kohana_global_data)) ? TRUE : FALSE; } // Return the result @@ -192,12 +192,12 @@ class View_Core { { foreach ($name as $key => $value) { - self::$kohana_global_data[$key] = $value; + View::$kohana_global_data[$key] = $value; } } else { - self::$kohana_global_data[$name] = $value; + View::$kohana_global_data[$name] = $value; } } @@ -225,8 +225,8 @@ class View_Core { if (isset($this->kohana_local_data[$key])) return $this->kohana_local_data[$key]; - if (isset(self::$kohana_global_data[$key])) - return self::$kohana_global_data[$key]; + if (isset(View::$kohana_global_data[$key])) + return View::$kohana_global_data[$key]; if (isset($this->$key)) return $this->$key; @@ -266,7 +266,7 @@ class View_Core { if (is_string($this->kohana_filetype)) { // Merge global and local data, local overrides global with the same name - $data = array_merge(self::$kohana_global_data, $this->kohana_local_data); + $data = array_merge(View::$kohana_global_data, $this->kohana_local_data); // Load the view in the controller for access to $this $output = Kohana::$instance->_kohana_load_view($this->kohana_filename, $data); |