diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-06 11:11:30 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-06 11:11:30 +0000 |
| commit | f037130086076c5f652ca298f4c859f9f4d9fb6c (patch) | |
| tree | d759bfe466004aeabf99324bc5e7776162616680 /modules | |
| parent | 300f91f4a7c7e4ae177176ba4421128597144ade (diff) | |
| download | brdo-f037130086076c5f652ca298f4c859f9f4d9fb6c.tar.gz brdo-f037130086076c5f652ca298f4c859f9f4d9fb6c.tar.bz2 | |
- Oopsie when committing.
Diffstat (limited to 'modules')
| -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; |