Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 9 insertions, 1 deletions

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 20dfeb04..0018fd9a 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");
     }
@@ -37,16 +38,23 @@ class gallery_theme_Core {
       }
     }
 
+    if (count(locales::installed())) {
+      // Needed by the languages block
+      $theme->script("jquery.cookie.js");
+    }
+
     if ($session->get("l10n_mode", false)) {
       $theme->css("l10n_client.css");
       $theme->script("jquery.cookie.js");
       $theme->script("l10n_client.js");
     }
 
+    $theme->css("uploadify/uploadify.css");
     return $buf;
   }
 
   static function admin_head($theme) {
+    $theme->css("gallery.css");
     $theme->script("gallery.panel.js");
     $session = Session::instance();
     if ($session->get("debug")) {
@@ -88,7 +96,7 @@ class gallery_theme_Core {
   }
 
   static function credits() {
-     return "<li class=\"first\">" .
+     return "<li class=\"g-first\">" .
       t(module::get_var("gallery", "credits"),
         array("url" => "http://gallery.menalto.com", "version" => gallery::VERSION)) .
       "</li>";