diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/routes.php | 1 | ||||
| -rw-r--r-- | core/models/item.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/config/routes.php b/core/config/routes.php index 4da97654..0e2aa887 100644 --- a/core/config/routes.php +++ b/core/config/routes.php @@ -22,6 +22,7 @@ // The problem is that we're routing all requests to /{controllername} to Rest_Controller, // even requests to controllers that do not implement Rest_Controller. $config['^welcome$'] = 'welcome'; +$config['^media_rss/feed/(\d+)'] = 'media_rss/feed/$1'; // REST configuration // Any resource requests (eg: album/1 or comment/3) get dispatched to the REST diff --git a/core/models/item.php b/core/models/item.php index 0b576d2c..950be499 100644 --- a/core/models/item.php +++ b/core/models/item.php @@ -176,7 +176,7 @@ class Item_Model extends ORM_MPTT { 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) { + if ($this->is_album() || ($mime_type = file::mime($this->file_path())) === false) { $mime_type = "application/unknown"; } return $mime_type; |