diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-14 01:12:32 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-14 01:12:32 +0000 |
| commit | 2898fe3b82ce10d045dd2c274a3290bacf209a00 (patch) | |
| tree | 5aced91bb92d8c9136cabf60ebc918248328907a /modules/gallery/libraries/MY_View.php | |
| parent | 47cbef684d41a4d51a9848091997e10b909abf32 (diff) | |
| parent | e4a43c99e421c830e569eaae6294286ed51e0ad8 (diff) | |
Git pull from devel line.
Diffstat (limited to 'modules/gallery/libraries/MY_View.php')
| -rw-r--r-- | modules/gallery/libraries/MY_View.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php index ded77792..2230203a 100644 --- a/modules/gallery/libraries/MY_View.php +++ b/modules/gallery/libraries/MY_View.php @@ -23,8 +23,14 @@ class View extends View_Core { /** * Reimplement Kohana 2.3's View::set_global() functionality. */ - public function set_global($key, $value) { - View::$global_data[$key] = $value; + public function set_global($key, $value = NULL) { + if (is_array($key)) { + foreach ($key as $key2 => $value) { + View::$global_data[$key2] = $value; + } + } else { + View::$global_data[$key] = $value; + } } public function is_set($key=null) { |