From 7fafb4d0d28bef3902da4cc172cd53c2376aeb03 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 05 Jun 2014 03:23:13 -0400
Subject: [PATCH] Remove leftover from merge; set alt text for contact photo

---
 program/js/treelist.js      |    1 -
 program/steps/mail/show.inc |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/program/js/treelist.js b/program/js/treelist.js
index 65f5fd4..958ae81 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -780,7 +780,6 @@
           focus_next(parent, dir, true);
         }
     }
->>>>>>> dev-accessibility
   }
 
 
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 0ebdd62..e6ab489 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -356,5 +356,5 @@
         $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);
 }

--
Gitblit v1.9.1