diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-29 08:53:05 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-29 08:53:05 -0700 |
| commit | c038164c0f41ba5c33f578f395c9fede80d96db8 (patch) | |
| tree | 1452f6e5ae5786048a5a2835275c553e80c60462 /classes/File.php | |
| parent | 7b7f09195a8082c8e26e87f7deb8b1002b852689 (diff) | |
| parent | 452123916d08354d11a198517cbc91980a113fcd (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/File.php')
| -rw-r--r-- | classes/File.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/File.php b/classes/File.php index 0cd31075d..0f230a6ee 100644 --- a/classes/File.php +++ b/classes/File.php @@ -302,6 +302,7 @@ class File extends Memcached_DataObject if(! isset($this->filename)){ $notEnclosureMimeTypes = array(null,'text/html','application/xhtml+xml'); + $mimetype = $this->mimetype; if($mimetype != null){ $mimetype = strtolower($this->mimetype); } |