Remove leftover from merge; set alt text for contact photo

12 years ago · 7fafb4d0d2
parent 99cdca46b7
commit 7fafb4d0d2
2 changed files with 1 additions and 2 deletions
--- 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
  }


--- 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);
 }