Merge branch 'master' into js-unit-testing

2017-03-26 06:46:42 +02:00
parent 145cfccfcb a8d02bd8e2
commit 6fb3fe51b2
14 changed files with 110 additions and 50 deletions
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -2080,7 +2080,8 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
         */
        me.hasAttachment = function()
        {
-            return ($attachmentLink.prop('href') !== '')
+            var link = $attachmentLink.prop('href');
+            return (typeof link !== 'undefined' && link !== '')
        }

        /**