Merge branch 'Ticket#1666_reset' of git://github.com/Joe7/gallery3

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index efef916f..df81ae65 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -110,11 +110,11 @@ class tag_event_Core {
   }
 
   static function add_photos_form($album, $form) {
-    if (!isset($group->uploadify)) {
+    $group = $form->add_photos;
+    if (!is_object($group->uploadify)) {
       return;
     }
 
-    $group = $form->add_photos;
     $group->input("tags")
       ->label(t("Add tags to all uploaded files"))
       ->value("");
@@ -133,7 +133,8 @@ class tag_event_Core {
   }
 
   static function add_photos_form_completed($album, $form) {
-    if (!isset($group->uploadify)) {
+    $group = $form->add_photos;
+    if (!is_object($group->uploadify)) {
       return;
     }