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
628715e4
Commit
628715e4
authored
Mar 21, 2004
by
Dries Buytaert
Browse files
- Patch
#6543
by Michelangelo: block path matching breaks when clean URLs are disabled.
parent
2043b336
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/block.module
View file @
628715e4
...
...
@@ -366,7 +366,7 @@ function block_list($region) {
if
(
$block
[
'custom'
]
&&
$user
->
uid
&&
!
isset
(
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]))
{
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]
=
$block
[
'status'
];
}
if
(((
$block
[
'status'
]
&&
(
!
$user
->
uid
||
!
$block
[
'custom'
]))
||
(
$block
[
'custom'
]
&&
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]))
&&
(
!
$block
[
'path'
]
||
preg_match
(
$block
[
'path'
],
str_replace
(
'?q='
,
'/'
,
request_uri
()))))
{
if
(((
$block
[
'status'
]
&&
(
!
$user
->
uid
||
!
$block
[
'custom'
]))
||
(
$block
[
'custom'
]
&&
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]))
&&
(
!
$block
[
'path'
]
||
preg_match
(
$block
[
'path'
],
str_replace
(
'
/
?q='
,
'/'
,
request_uri
()))))
{
/*
** Check the current throttle status and see if block should be displayed
...
...
modules/block/block.module
View file @
628715e4
...
...
@@ -366,7 +366,7 @@ function block_list($region) {
if
(
$block
[
'custom'
]
&&
$user
->
uid
&&
!
isset
(
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]))
{
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]
=
$block
[
'status'
];
}
if
(((
$block
[
'status'
]
&&
(
!
$user
->
uid
||
!
$block
[
'custom'
]))
||
(
$block
[
'custom'
]
&&
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]))
&&
(
!
$block
[
'path'
]
||
preg_match
(
$block
[
'path'
],
str_replace
(
'?q='
,
'/'
,
request_uri
()))))
{
if
(((
$block
[
'status'
]
&&
(
!
$user
->
uid
||
!
$block
[
'custom'
]))
||
(
$block
[
'custom'
]
&&
$user
->
block
[
$block
[
'module'
]][
$block
[
'delta'
]]))
&&
(
!
$block
[
'path'
]
||
preg_match
(
$block
[
'path'
],
str_replace
(
'
/
?q='
,
'/'
,
request_uri
()))))
{
/*
** Check the current throttle status and see if block should be displayed
...
...
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