search: Fix double creation of dynamic data

include/class.organization.php

@@ -116,17 +116,17 @@ class Organization extends OrganizationModel {
         return $of;
     }
 
-    function getDynamicData() {
+    function getDynamicData($create=true) {
         if (!isset($this->_entries)) {
             $this->_entries = DynamicFormEntry::forOrganization($this->id)->all();
-            if (!$this->_entries) {
+            if (!$this->_entries && $create) {
                 $g = OrganizationForm::getInstance($this->id, true);
                 $g->save();
                 $this->_entries[] = $g;
             }
         }
 
-        return $this->_entries;
+        return $this->_entries ?: array();
     }
 
     function getForms($data=null) {

include/class.search.php

@@ -126,7 +126,7 @@ class SearchInterface {
 
         case $model instanceof User:
             $cdata = array();
-            foreach ($model->getDynamicData() as $e)
+            foreach ($model->getDynamicData($false) as $e)
                 foreach ($e->getAnswers() as $tag=>$a)
                     if ($tag != 'subject' && ($v = $a->getSearchable()))
                         $cdata[] = $v;
@@ -144,7 +144,7 @@ class SearchInterface {
 
         case $model instanceof Organization:
             $cdata = array();
-            foreach ($model->getDynamicData() as $e)
+            foreach ($model->getDynamicData(false) as $e)
                 foreach ($e->getAnswers() as $a)
                     if ($v = $a->getSearchable())
                         $cdata[] = $v;

include/class.user.php

@@ -287,10 +287,10 @@ class User extends UserModel {
         return $uf;
     }
 
-    function getDynamicData() {
+    function getDynamicData($create=true) {
         if (!isset($this->_entries)) {
             $this->_entries = DynamicFormEntry::forClient($this->id)->all();
-            if (!$this->_entries) {
+            if (!$this->_entries && $create) {
                 $g = UserForm::getNewInstance();
                 $g->setClientId($this->id);
                 $g->save();
@@ -298,7 +298,7 @@ class User extends UserModel {
             }
         }
 
-        return $this->_entries;
+        return $this->_entries ?: array();
     }
 
     function getFilterData() {