diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-01-19 22:26:34 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-01-19 22:26:34 -0800 |
| commit | 52ab0e99884e6f018e540c3c64cb877fd608cef6 (patch) | |
| tree | 179e6331f0ecbb8f3b38a6b728abb6ebf3fda0b7 /modules/gallery/controllers/file_proxy.php | |
| parent | 2c584d5d23a346b085259a717055fbbb6c737da4 (diff) | |
| parent | 592eff0e5a8af6f74eff4806dc6e7de56ca02761 (diff) | |
Merge pull request #89 from shadlaws/fix_1942
#1942 - Make data_rest and file_proxy more consistent
Diffstat (limited to 'modules/gallery/controllers/file_proxy.php')
| -rw-r--r-- | modules/gallery/controllers/file_proxy.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php index b9ff7df1..9af58c0c 100644 --- a/modules/gallery/controllers/file_proxy.php +++ b/modules/gallery/controllers/file_proxy.php @@ -100,6 +100,9 @@ class File_Proxy_Controller extends Controller { throw new Kohana_404_Exception(); } + // Note: this code is roughly duplicated in data_rest, so if you modify this, please look to + // see if you should make the same change there as well. + if ($type == "albums") { $file = $item->file_path(); } else if ($type == "resizes") { |