summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-06-05 09:23:13 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-06-05 09:23:13 +0200
commit7fafb4d0d28bef3902da4cc172cd53c2376aeb03 (patch)
treeb78adc7b9731ef34c2aeb1b0ad60292c3e6587f1 /program
parent99cdca46b7bcc46fe6affd9e9f9f60a546b2e5b8 (diff)
Remove leftover from merge; set alt text for contact photo
Diffstat (limited to 'program')
-rw-r--r--program/js/treelist.js1
-rw-r--r--program/steps/mail/show.inc2
2 files changed, 1 insertions, 2 deletions
diff --git a/program/js/treelist.js b/program/js/treelist.js
index 65f5fd4f4..958ae81e2 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -780,7 +780,6 @@ function rcube_treelist_widget(node, p)
focus_next(parent, dir, true);
}
}
->>>>>>> dev-accessibility
}
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 0ebdd6277..e6ab4891b 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -356,5 +356,5 @@ function rcmail_message_contactphoto($attrib)
$photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';
}
- return html::img(array('src' => $photo_img) + $attrib);
+ return html::img(array('src' => $photo_img, 'alt' => $RCMAIL->gettext('contactphoto')) + $attrib);
}