Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
76226df8
Commit
76226df8
authored
Nov 10, 2005
by
Steven Wittens
Browse files
#36242
: Array merge problems with module_invoke
parent
c19a04e6
Changes
4
Hide whitespace changes
Inline
Side-by-side
modules/filter.module
View file @
76226df8
...
...
@@ -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
))
{
...
...
modules/filter/filter.module
View file @
76226df8
...
...
@@ -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
))
{
...
...
modules/search.module
View file @
76226df8
...
...
@@ -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'
][
'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
);
}
...
...
modules/search/search.module
View file @
76226df8
...
...
@@ -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'
][
'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
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment