diff options
| -rw-r--r-- | modules/block.module | 5 | ||||
| -rw-r--r-- | modules/block/block.module | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/block.module b/modules/block.module index 18461edca..93a93c260 100644 --- a/modules/block.module +++ b/modules/block.module @@ -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; diff --git a/modules/block/block.module b/modules/block/block.module index 18461edca..93a93c260 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -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; |