Merge pull request #669 from demeritcowboy/array

Views notice fix. Remove duplicate call to constructor.
civicrm · Sep 8, 2023 · 1d0bbd8 · 1d0bbd8
2 parents 0e30129 + 8f74980
commit 1d0bbd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_field_pseudo_constant.inc
@@ -20,7 +20,6 @@ class civicrm_handler_field_pseudo_constant extends views_handler_field {
   public $_pseudo_constant;
 
   public function construct() {
-    parent::construct();
     parent::construct();
     if (!civicrm_initialize() ||
       !isset($this->definition['pseudo class']) ||

diff --git a/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc b/modules/views/civicrm/civicrm_handler_filter_pseudo_constant.inc
@@ -43,6 +43,9 @@ class civicrm_handler_filter_pseudo_constant extends views_handler_filter_in_ope
     $callback = $this->definition['pseudo class'] . "::" . $this->definition['pseudo method'];
     if (is_callable($callback)) {
       $this->_pseudo_constant = call_user_func_array($callback, $pseudo_args);
+      if ($this->_pseudo_constant === FALSE) {
+        $this->_pseudo_constant = [];
+      }
       // Do we really need to resolve this during `construct()`ion? There's on-demand caching in `get_value_options()`.
     }
     else {