Merge branch 'master' into develop

2015-10-09 16:40:27 +01:00 · 2015-10-09 16:40:27 +01:00 · aed1fe9bf1
parent c68ef38399 7296cbfd5b
commit aed1fe9bf1
1 changed files with 1 additions and 1 deletions
--- a/src/skins/vector/views/molecules/MImageTile.js
+++ b/src/skins/vector/views/molecules/MImageTile.js
@ -83,7 +83,7 @@ module.exports = React.createClass({
                <div className="mx_MImageTile_download">
                    <a href={cli.mxcUrlToHttp(content.url)} target="_blank">
                        <img src="img/download.png" width="10" height="12"/>
-                        Download {content.body} ({ filesize(content.info.size) })
+                        Download {content.body} ({ content.info && content.info.size ? filesize(content.info.size) : "Unknown size" })
                    </a>
                </div>
            </span>