Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.788
diff -u -r1.788 common.inc
--- includes/common.inc	21 Aug 2008 19:36:36 -0000	1.788
+++ includes/common.inc	22 Aug 2008 02:06:14 -0000
@@ -1286,13 +1286,14 @@
  */
 function url($path = NULL, $options = array()) {
   // Merge in defaults.
-  $options += array(
+  $options = (is_array($options) ? $options : array()) + array(
     'fragment' => '',
     'query' => '',
     'absolute' => FALSE,
     'alias' => FALSE,
     'prefix' => ''
   );
+  
   if (!isset($options['external'])) {
     // Return an external link if $path contains an allowed absolute URL.
     // Only call the slow filter_xss_bad_protocol if $path contains a ':' before
@@ -1459,10 +1460,10 @@
  */
 function l($text, $path, $options = array()) {
   // Merge in defaults.
-  $options += array(
-      'attributes' => array(),
-      'html' => FALSE,
-    );
+  $options = (is_array($options) ? $options : array()) + array(
+    'attributes' => array(),
+    'html' => FALSE,
+  );
 
   // Append active class.
   if ($path == $_GET['q'] || ($path == '<front>' && drupal_is_front_page())) {