Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.799
diff -u -9 -p -r1.799 common.inc
--- includes/common.inc	20 Sep 2008 20:22:23 -0000	1.799
+++ includes/common.inc	2 Oct 2008 21:34:31 -0000
@@ -1312,19 +1312,19 @@ function format_date($timestamp, $type =
  *   - 'prefix'
  *       Only used internally, to modify the path when a language dependent URL
  *       requires so.
  * @return
  *   A string containing a URL to the given path.
  *
  * When creating links in modules, consider whether l() could be a better
  * alternative than url().
  */
-function url($path = NULL, $options = array()) {
+function url($path = NULL, array $options = array()) {
   // Merge in defaults.
   $options += array(
     'fragment' => '',
     'query' => '',
     'absolute' => FALSE,
     'alias' => FALSE,
     'prefix' => ''
   );
   if (!isset($options['external'])) {
@@ -1485,19 +1485,19 @@ function drupal_attributes($attributes =
  *     - 'html' (default FALSE)
  *       Whether the title is HTML, or just plain-text. For example for making
  *       an image a link, this must be set to TRUE, or else you will see the
  *       escaped HTML.
  *     - 'alias' (default FALSE)
  *       Whether the given path is an alias already.
  * @return
  *   an HTML string containing a link to the given path.
  */
-function l($text, $path, $options = array()) {
+function l($text, $path, array $options = array()) {
   // Merge in defaults.
   $options += array(
       'attributes' => array(),
       'html' => FALSE,
     );
 
   // Append active class.
   if ($path == $_GET['q'] || ($path == '<front>' && drupal_is_front_page())) {
     if (isset($options['attributes']['class'])) {