diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-05 12:09:31 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-05 12:09:31 -0800 |
| commit | dfc082ad5f972593998ad08c7c98cadf40bcfebd (patch) | |
| tree | 917e0d103b148876f773d0ab7dce7f563d6f3b4d | |
| parent | 8ca69cffbba70fe22e19478f742a37bdbd758d83 (diff) | |
| parent | fcbf824c05a7ba61391c0b5afc1589436490e7ba (diff) | |
Merge branch 'master' into talmdal_dev
| -rw-r--r-- | modules/gallery/controllers/admin_theme_options.php | 3 | ||||
| -rw-r--r-- | modules/rss/views/feed.mrss.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php index 9de54c78..6297e4aa 100644 --- a/modules/gallery/controllers/admin_theme_options.php +++ b/modules/gallery/controllers/admin_theme_options.php @@ -64,7 +64,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller { url::redirect("admin/theme_options"); } else { $view = new Admin_View("admin.html"); - $view->content = $form; + $view->content = new View("admin_theme_options.html"); + $view->content->form = $form; print $view; } } diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php index 5fce8699..a61ee96c 100644 --- a/modules/rss/views/feed.mrss.php +++ b/modules/rss/views/feed.mrss.php @@ -56,7 +56,6 @@ type="<?= $child->mime_type ?>" height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" - isDefault="true" /> <? if (access::can("view_full", $child)): ?> <media:content url="<?= $child->file_url(true) ?>" @@ -64,6 +63,7 @@ type="<?= $child->mime_type ?>" height="<?= $child->height ?>" width="<?= $child->width ?>" + isDefault="true" /> <? endif ?> <? else: ?> |