Merge remote-tracking branch 'peter/issue/ticket-filter-data' into features_prs/develop-next

* peter/issue/ticket-filter-data:
  Ticket Filter Data Custom Forms

include/class.organization.php

@@ -277,13 +277,16 @@ implements TemplateVariable, Searchable {
     function getFilterData() {
         $vars = array();
         foreach ($this->getDynamicData() as $entry) {
+            $vars += $entry->getFilterData();
+
+            // Add special `name` field in Org form
             if ($entry->getDynamicForm()->get('type') != 'O')
                 continue;
-            $vars += $entry->getFilterData();
-            // Add special `name` field
-            $f = $entry->getField('name');
-            $vars['field.'.$f->get('id')] = $this->getName();
+
+            if ($f = $entry->getField('name'))
+                $vars['field.'.$f->get('id')] = $this->getName();
         }
+
         return $vars;
     }
 

include/class.user.php

@@ -426,16 +426,19 @@ implements TemplateVariable, Searchable {
     function getFilterData() {
         $vars = array();
         foreach ($this->getDynamicData() as $entry) {
-            if ($entry->getDynamicForm()->get('type') != 'U')
-                continue;
             $vars += $entry->getFilterData();
+
             // Add in special `name` and `email` fields
+            if ($entry->getDynamicForm()->get('type') != 'U')
+                continue;
+
             foreach (array('name', 'email') as $name) {
                 if ($f = $entry->getField($name))
                     $vars['field.'.$f->get('id')] =
                         $name == 'name' ? $this->getName() : $this->getEmail();
             }
         }
+
         return $vars;
     }