Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#36242: Array merge problems with module_invoke

4.7.x
Steven Wittens 2005-11-10 20:36:13 +00:00
parent c19a04e6f8
commit 76226df867
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/filter.module
View File

@ -563,7 +563,10 @@ function filter_admin_configure() {
$list = filter_list_format($format); $list = filter_list_format($format);
$form = array(); $form = array();
foreach ($list as $filter) { 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)) { if (!empty($form)) {

5
modules/filter/filter.module
View File

@ -563,7 +563,10 @@ function filter_admin_configure() {
$list = filter_list_format($format); $list = filter_list_format($format);
$form = array(); $form = array();
foreach ($list as $filter) { 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)) { if (!empty($form)) {

5
modules/search.module
View File

@ -931,7 +931,10 @@ function search_form($action = '', $keys = '', $type = null, $prompt = null) {
$form['basic']['inline']['keys'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $keys, '#size' => $prompt ? 40 : 30, '#maxlength' => 255); $form['basic']['inline']['keys'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $keys, '#size' => $prompt ? 40 : 30, '#maxlength' => 255);
$form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search')); $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search'));
$form = array_merge($form, module_invoke($type, 'search', 'form', $keys)); $form_module = module_invoke($type, 'search', 'form', $keys);
if (is_array($form_module)) {
$form = array_merge($form, $form_module);
}
return drupal_get_form('search_form', $form); return drupal_get_form('search_form', $form);
} }

5
modules/search/search.module
View File

@ -931,7 +931,10 @@ function search_form($action = '', $keys = '', $type = null, $prompt = null) {
$form['basic']['inline']['keys'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $keys, '#size' => $prompt ? 40 : 30, '#maxlength' => 255); $form['basic']['inline']['keys'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $keys, '#size' => $prompt ? 40 : 30, '#maxlength' => 255);
$form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search')); $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search'));
$form = array_merge($form, module_invoke($type, 'search', 'form', $keys)); $form_module = module_invoke($type, 'search', 'form', $keys);
if (is_array($form_module)) {
$form = array_merge($form, $form_module);
}
return drupal_get_form('search_form', $form); return drupal_get_form('search_form', $form);
} }