diff --git a/includes/common.inc b/includes/common.inc
index c32bee9d879..4b47f92cb65 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1022,7 +1022,7 @@ function url($path = NULL, $query = NULL, $fragment = NULL, $absolute = FALSE) {
   // Only call the slow filter_xss_bad_protocol if $path contains a ':'.
   if (strpos($path, ':') !== FALSE && filter_xss_bad_protocol($path, FALSE) == check_plain($path)) {
     // Split off the fragment
-    if (strpos($path, '#')) {
+    if (strpos($path, '#') !== FALSE) {
       list($path, $old_fragment) = explode('#', $path, 2);
       if (isset($old_fragment) && !isset($fragment)) {
         $fragment = '#'. $old_fragment;
@@ -1030,7 +1030,7 @@ function url($path = NULL, $query = NULL, $fragment = NULL, $absolute = FALSE) {
     }
     // Append the query
     if (isset($query)) {
-      $path .= (strpos($path, '?') ? '&' : '?') . $query;
+      $path .= (strpos($path, '?') !== FALSE ? '&' : '?') . $query;
     }
     // Reassemble
     return $path . $fragment;