Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
295
Merge Requests
295
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
52540538
Commit
52540538
authored
Feb 14, 2007
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#118183
by chx: tabs fixes.
parent
f9605d80
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
includes/menu.inc
includes/menu.inc
+9
-6
modules/search/search.module
modules/search/search.module
+1
-5
No files found.
includes/menu.inc
View file @
52540538
...
...
@@ -531,18 +531,18 @@ function menu_rebuild() {
if
(
preg_match
(
'/^%([a-z_]*)$/'
,
$part
,
$matches
))
{
if
(
empty
(
$matches
[
1
]))
{
$match
=
TRUE
;
$load_functions
[
$k
]
=
NULL
;
$to_arg_functions
[
$k
]
=
NULL
;
}
else
{
if
(
function_exists
(
$matches
[
1
]
.
'_load'
))
{
$load_functions
[
$k
]
=
$matches
[
1
]
.
'_load'
;
$match
=
TRUE
;
}
if
(
function_exists
(
$matches
[
1
]
.
'_to_arg'
))
{
$to_arg_functions
[
$k
]
=
$matches
[
1
]
.
'_to_arg'
;
$load_functions
[
$k
]
=
NULL
;
$match
=
TRUE
;
}
if
(
!
isset
(
$load_functions
[
$k
])
&&
isset
(
$to_arg_functions
[
$k
]))
{
$load_functions
[
$k
]
=
FALSE
;
if
(
function_exists
(
$matches
[
1
]
.
'_load'
))
{
$load_functions
[
$k
]
=
$matches
[
1
]
.
'_load'
;
$match
=
TRUE
;
}
}
}
...
...
@@ -670,6 +670,9 @@ function menu_rebuild() {
if
(
!
isset
(
$item
[
'parent'
]))
{
$item
[
'parent'
]
=
implode
(
'/'
,
array_slice
(
$item
[
'_parts'
],
0
,
$item
[
'_number_parts'
]
-
1
));
}
else
{
$item
[
'_depth'
]
=
$item
[
'parent'
]
?
$menu
[
$item
[
'parent'
]][
'_depth'
]
+
1
:
1
;
}
}
else
{
// Non-tab items specified the parent for visible links, and it's
...
...
modules/search/search.module
View file @
52540538
...
...
@@ -166,7 +166,7 @@ function search_menu() {
);
foreach
(
module_implements
(
'search'
)
as
$name
)
{
$items
[
'search/'
.
$name
.
'/%
search
'
]
=
array
(
$items
[
'search/'
.
$name
.
'/%'
]
=
array
(
'title'
=>
module_invoke
(
$name
,
'search'
,
'name'
,
TRUE
),
'page callback'
=>
'search_view'
,
'page arguments'
=>
array
(
$name
),
...
...
@@ -183,10 +183,6 @@ function _search_menu($name) {
return
user_access
(
'search content'
)
&&
module_invoke
(
$name
,
'search'
,
'name'
);
}
function
search_to_arg
()
{
return
search_get_keys
();
}
/**
* Validate callback.
*/
...
...
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