Merge remote branch 'upstream/master'

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) {