Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Oopsie when committing.

4.5.x
Steven Wittens 2004-08-06 11:11:30 +00:00
parent 300f91f4a7
commit f037130086
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/block.module
View File

@ -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;

5
modules/block/block.module
View File

@ -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;