summaryrefslogtreecommitdiff
path: root/core/models
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2008-11-19 02:31:20 +0000
committerTim Almdal <tnalmdal@shaw.ca>2008-11-19 02:31:20 +0000
commitad7ace9b72532512c67953d7149854312b6b195d (patch)
treec59fe3534e4e089ae919220dacc36f1acf120489 /core/models
parentb2772f5a050351129a64b966b127e39cf76c80b5 (diff)
The continuing evolution of the slideshow...
1) added a mime_type property to the item module(no database change) 2) created a media_rss module 3) moved most of the functionality for the downloading the images to the media_rss module
Diffstat (limited to 'core/models')
-rw-r--r--core/models/item.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/models/item.php b/core/models/item.php
index 485975cb..0b576d2c 100644
--- a/core/models/item.php
+++ b/core/models/item.php
@@ -175,6 +175,11 @@ class Item_Model extends ORM_MPTT {
$real_column = substr($column, 0, strlen($column) - 5);
return "<span class=\"gInPlaceEdit gEditField-{$this->id}-{$real_column}\">" .
"{$this->$real_column}</span>";
+ } else if ($column == "mime_type") {
+ if ($this->is_album() || ($mime_type = file::mime()) === false) {
+ $mime_type = "application/unknown";
+ }
+ return $mime_type;
} else if ($column == "owner") {
// This relationship depends on an outside module, which may not be present so handle
// failures gracefully.