Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
886ae2bf
Commit
886ae2bf
authored
Jun 30, 2003
by
Dries
Browse files
- Fixed some "search related" bugs introduced by Moshe's latest patch. Fixes bug
#2127
.
parent
74d9266b
Changes
7
Hide whitespace changes
Inline
Side-by-side
includes/common.inc
View file @
886ae2bf
...
...
@@ -339,7 +339,7 @@ function search_item($item, $type) {
* @param $options != 0: Render additional form fields/text
* ("Restrict search to", help text, etc).
*/
function
search_form
(
$action
=
0
,
$keys
=
0
,
$options
=
0
)
{
function
search_form
(
$action
=
NULL
,
$keys
=
NULL
,
$options
=
NULL
)
{
if
(
!
$action
)
{
$action
=
url
(
"search"
);
...
...
@@ -400,11 +400,9 @@ function search_data($keys = NULL) {
* @param $options != 0: Render additional form fields/text
* ("Restrict search to", help text, etc).
*/
function
search_type
(
$type
=
0
,
$action
=
0
,
$keys
=
0
,
$options
=
0
)
{
function
search_type
(
$type
,
$action
=
NULL
,
$keys
=
NULL
,
$options
=
NULL
)
{
if
(
isset
(
$type
))
{
$_POST
[
"edit"
][
"type"
][
$type
]
=
"on"
;
}
$_POST
[
"edit"
][
"type"
][
$type
]
=
"on"
;
return
search_form
(
$action
,
$keys
,
$options
)
.
"<br />"
.
search_data
(
$keys
);
}
...
...
modules/comment.module
View file @
886ae2bf
...
...
@@ -1066,7 +1066,7 @@ function comment_admin() {
print
comment_admin_edit
(
arg
(
3
));
break
;
case
"search"
:
print
search_type
(
"comment"
,
url
(
"admin/comment/search"
));
print
search_type
(
"comment"
,
url
(
"admin/comment/search"
)
,
$_POST
[
"keys"
]
);
break
;
case
"votes"
:
case
t
(
"Add new vote"
)
:
...
...
modules/comment/comment.module
View file @
886ae2bf
...
...
@@ -1066,7 +1066,7 @@ function comment_admin() {
print
comment_admin_edit
(
arg
(
3
));
break
;
case
"search"
:
print
search_type
(
"comment"
,
url
(
"admin/comment/search"
));
print
search_type
(
"comment"
,
url
(
"admin/comment/search"
)
,
$_POST
[
"keys"
]
);
break
;
case
"votes"
:
case
t
(
"Add new vote"
)
:
...
...
modules/node.module
View file @
886ae2bf
...
...
@@ -797,7 +797,7 @@ function node_admin() {
*/
switch
(
$op
)
{
case
"search"
:
print
search_type
(
"node"
,
url
(
"admin/node/search"
));
print
search_type
(
"node"
,
url
(
"admin/node/search"
)
,
$_POST
[
"keys"
]
);
break
;
case
"edit"
:
print
node_admin_edit
(
arg
(
3
));
...
...
modules/node/node.module
View file @
886ae2bf
...
...
@@ -797,7 +797,7 @@ function node_admin() {
*/
switch
(
$op
)
{
case
"search"
:
print
search_type
(
"node"
,
url
(
"admin/node/search"
));
print
search_type
(
"node"
,
url
(
"admin/node/search"
)
,
$_POST
[
"keys"
]
);
break
;
case
"edit"
:
print
node_admin_edit
(
arg
(
3
));
...
...
modules/user.module
View file @
886ae2bf
...
...
@@ -1635,7 +1635,7 @@ function user_admin() {
switch
(
$op
)
{
case
"search"
:
print
search_type
(
"user"
,
url
(
"admin/user/search"
));
print
search_type
(
"user"
,
url
(
"admin/user/search"
)
,
$_POST
[
"keys"
]
);
break
;
case
t
(
"Add rule"
)
:
case
t
(
"Check"
)
:
...
...
modules/user/user.module
View file @
886ae2bf
...
...
@@ -1635,7 +1635,7 @@ function user_admin() {
switch
(
$op
)
{
case
"search"
:
print
search_type
(
"user"
,
url
(
"admin/user/search"
));
print
search_type
(
"user"
,
url
(
"admin/user/search"
)
,
$_POST
[
"keys"
]
);
break
;
case
t
(
"Add rule"
)
:
case
t
(
"Check"
)
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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