Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 8 insertions, 0 deletions

diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 7fe9fba3..0cc2170c 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -106,6 +106,10 @@ class tag_event_Core {
   }
 
   static function add_photos_form($album, $form) {
+    if (!isset($group->uploadify)) {
+      return;
+    }
+    
     $group = $form->add_photos;
     $group->input("tags")
       ->label(t("Add tags to all uploaded files"))
@@ -125,6 +129,10 @@ class tag_event_Core {
   }
 
   static function add_photos_form_completed($album, $form) {
+    if (!isset($group->uploadify)) {
+      return;
+    }
+    
     foreach (explode(",", $form->add_photos->tags->value) as $tag_name) {
       $tag_name = trim($tag_name);
       if ($tag_name) {