diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-06 16:14:44 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-06 16:14:44 -0800 |
| commit | b0a73757d220ca7a60109c50937a5851e5e44227 (patch) | |
| tree | 0ac99d2608bf723d41c1a80f488af6f2f78a36c3 /modules/g2_import/controllers/g2.php | |
| parent | 0f9d23d074c81eafab05ce5d64909da624a86422 (diff) | |
| parent | 33b39efb491d730c8653ca3c06a22297338aa8b8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/controllers/g2.php')
| -rw-r--r-- | modules/g2_import/controllers/g2.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php index 5fd4400c..8260cf9f 100644 --- a/modules/g2_import/controllers/g2.php +++ b/modules/g2_import/controllers/g2.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class G2_Controller extends Admin_Controller { +class G2_Controller extends Controller { /** * Redirect Gallery 2 urls to their appropriate matching Gallery 3 url. * @@ -64,6 +64,7 @@ class G2_Controller extends Admin_Controller { case "resize": url::redirect($item->resize_url(true)); + case "file": case "full": url::redirect($item->file_url(true)); |