diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-11-10 20:36:13 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-11-10 20:36:13 +0000 |
| commit | 76226df8672409b23856b8ade20d1d884d934af8 (patch) | |
| tree | 5078f7c0579fe573695fbaca948a85cd7989b4ae /modules/filter | |
| parent | c19a04e6f896500af1ce8c6cf35bbb134a4ee680 (diff) | |
| download | brdo-76226df8672409b23856b8ade20d1d884d934af8.tar.gz brdo-76226df8672409b23856b8ade20d1d884d934af8.tar.bz2 | |
#36242: Array merge problems with module_invoke
Diffstat (limited to 'modules/filter')
| -rw-r--r-- | modules/filter/filter.module | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/filter/filter.module b/modules/filter/filter.module index b471ae42b..c7964b198 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -563,7 +563,10 @@ function filter_admin_configure() { $list = filter_list_format($format); $form = array(); foreach ($list as $filter) { - $form = array_merge($form, module_invoke($filter->module, 'filter', 'settings', $filter->delta, $format)); + $form_module = module_invoke($filter->module, 'filter', 'settings', $filter->delta, $format); + if (is_array($form_module)) { + $form = array_merge($form, $form_module); + } } if (!empty($form)) { |