Skip to content

GitLab

D
drupal
Commit f0371300 authored by Steven Wittens's avatar Steven Wittens
Browse files
Options

- Oopsie when committing.

parent 300f91f4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment