Merge branch 'master' into talmdal_dev

2 files changed, 2 insertions, 1 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 216efa36..2ee20417 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -266,7 +266,7 @@ class gallery_event_Core {
             ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
       }
 
-      // Don't move photos from the photo page; we don't yet have a good way of redirecting after
+      // @todo Don't move photos from the photo page; we don't yet have a good way of redirecting after
       // move
       if ($page_type == "album") {
         $options_menu
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 5f3eb2a9..49a458b7 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,6 +21,7 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
+    $theme->css("gallery.css");
     if ($session->get("debug")) {
       $theme->css("debug.css");
     }