diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index dcc8ae5..36a86b0 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1673,7 +1673,7 @@ function template_preprocess_comment(&$variables) {
     $variables['parent_created'] = format_date($comment_parent->created);
     $variables['parent_changed'] = format_date($comment_parent->changed);
     $uri_parent = $comment_parent->uri();
-    $uri_parent['attributes'] += array('class' => array('permalink'), 'rel' => 'bookmark');
+    $uri_parent['attributes'] = array('class' => array('permalink'), 'rel' => 'bookmark');
     $variables['parent_title'] = l($comment_parent->subject, $uri_parent['path'], $uri_parent['options'], $uri_parent['attributes']);
     $variables['parent_permalink'] = l(t('Parent permalink'), $uri_parent['path'], $uri_parent['options'], $uri_parent['attributes']);
     $variables['parent'] = t('In reply to !parent_title by !parent_username',
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 3f8de03..3f31cd4 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -351,7 +351,7 @@ function menu_edit_item($form, &$form_state, $type, $item, $menu) {
     $form['_path'] = array(
       '#type' => 'item',
       '#title' => t('Path'),
-      '#description' => l($item['href'], $item['link_title'], $item['options'], $item['attributes']),
+      '#description' => l($item['href'], $item['link_title'], $item['options'], isset($item['attributes']) ? $item['attributes'] : array()),
     );
   }
   // @todo: Make sure $item['attributes'] is set (changed from $item['options']['attributes'];