summaryrefslogtreecommitdiff
path: root/classes/File.php
diff options
context:
space:
mode:
authorNick Holliday <n.g.holliday@gmail.com>2010-03-24 23:30:27 +0000
committerCraig Andrews <candrews@integralblue.com>2010-03-26 18:16:44 -0400
commit92ded7c6cb56056a89bc8b3caabd08049104898e (patch)
treec622546cbaf4d20c185561d9f549c6a54b896308 /classes/File.php
parent1bf27de9b9b8c7f4f6e67280805c61d85cb1e45c (diff)
Fixes problem with IRC URLs showing as attachments
Diffstat (limited to 'classes/File.php')
-rw-r--r--classes/File.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/File.php b/classes/File.php
index 33273bbdc..c9477f5f1 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -286,7 +286,9 @@ class File extends Memcached_DataObject
if(! isset($this->filename)){
$notEnclosureMimeTypes = array(null,'text/html','application/xhtml+xml');
- $mimetype = strtolower($this->mimetype);
+ if($mimetype != null){
+ $mimetype = strtolower($this->mimetype);
+ }
$semicolon = strpos($mimetype,';');
if($semicolon){
$mimetype = substr($mimetype,0,$semicolon);