diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-01-11 10:46:11 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-01-11 10:46:11 +0000 |
| commit | 0d384c8ead658c95b32233f87d9b2308f3abf26b (patch) | |
| tree | f206bba9099ff2f6d84e8356a952e0f0b60f0c17 | |
| parent | ba3eead0d6f41931819e4f73ff3d7e48173c4092 (diff) | |
| download | brdo-0d384c8ead658c95b32233f87d9b2308f3abf26b.tar.gz brdo-0d384c8ead658c95b32233f87d9b2308f3abf26b.tar.bz2 | |
- Fixed "clean URL" glitch in queue module. Patch by Ax.
- Small improvement to url(). Patch by Ax.
| -rw-r--r-- | includes/common.inc | 5 | ||||
| -rw-r--r-- | modules/queue.module | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 84da63d0e..e67843333 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -719,7 +719,7 @@ function form_weight($title = NULL, $name = "weight", $value = 0, $delta = 10, $ return form_select($title, $name, $value, $weights, $description, $extra); } -function url($url, $query = NULL) { +function url($url = NULL, $query = NULL) { if (isset($url)) { if (isset($query)) { @@ -733,6 +733,9 @@ function url($url, $query = NULL) { if (isset($query)) { return "?$query"; } + else { + return ""; + } } } diff --git a/modules/queue.module b/modules/queue.module index 8593bec83..ab6ee2eb9 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -184,7 +184,7 @@ function queue_block($op = "list", $delta = 0) { return $blocks; } else { - if (user_access("access submission queue") && (substr_count(request_uri(), url("queue")) || substr_count(request_uri(), url()))) { + if (user_access("access submission queue") && (substr_count(request_uri(), url("queue")) || substr_count(request_uri(), url("node")))) { global $user, $id; if ($user->uid) { $node = node_load(array("nid" => $id)); |