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
f0371300
Commit
f0371300
authored
Aug 06, 2004
by
Steven Wittens
Browse files
- Oopsie when committing.
parent
300f91f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/block.module
View file @
f0371300
...
...
@@ -360,8 +360,9 @@ function block_list($region) {
if
(
$block
[
'path'
])
{
$base
=
parse_url
(
$base_url
);
$session
=
session_name
()
.
'='
.
session_id
();
$url
=
str_replace
(
array
(
$base
[
'path'
],
'?'
.
$session
),
''
,
request_uri
());
$matched
=
preg_match
(
$block
[
'path'
],
ereg_replace
(
'^/(\?q=)?'
,
''
,
$path
);
$url
=
str_replace
(
array
(
$base
[
'path'
],
'?'
.
$session
),
''
,
request_uri
());
$url
=
ereg_replace
(
'^/(\?q=)?'
,
''
,
$url
);
$matched
=
preg_match
(
$block
[
'path'
],
$url
);
}
else
{
$matched
=
true
;
...
...
modules/block/block.module
View file @
f0371300
...
...
@@ -360,8 +360,9 @@ function block_list($region) {
if
(
$block
[
'path'
])
{
$base
=
parse_url
(
$base_url
);
$session
=
session_name
()
.
'='
.
session_id
();
$url
=
str_replace
(
array
(
$base
[
'path'
],
'?'
.
$session
),
''
,
request_uri
());
$matched
=
preg_match
(
$block
[
'path'
],
ereg_replace
(
'^/(\?q=)?'
,
''
,
$path
);
$url
=
str_replace
(
array
(
$base
[
'path'
],
'?'
.
$session
),
''
,
request_uri
());
$url
=
ereg_replace
(
'^/(\?q=)?'
,
''
,
$url
);
$matched
=
preg_match
(
$block
[
'path'
],
$url
);
}
else
{
$matched
=
true
;
...
...
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