Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 6 insertions, 29 deletions

diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 098d87fd..31e2e8c0 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,35 +19,12 @@
  */
 class user_theme_Core {
   static function head($theme) {
-    if (count(locales::installed())) {
-      // Needed by the languages block
-      $theme->script("jquery.cookie.js");
-    }
-    return "";
+    $theme->css("user.css");
+    $theme->script("password_strength.js");
   }
 
-  static function header_top($theme) {
-    if ($theme->page_type != "login") {
-      $view = new View("login.html");
-      $view->user = user::active();
-      return $view->render();
-    }
+  static function admin_head($theme) {
+    $theme->css("user.css");
+    $theme->script("password_strength.js");
   }
-
-  static function sidebar_blocks($theme) {
-    $locales = locales::installed();
-    foreach ($locales as $locale => $display_name) {
-      $locales[$locale] = SafeString::of_safe_html($display_name);
-    }
-    if (count($locales) > 1) {
-      $block = new Block();
-      $block->css_id = "gUserLanguageBlock";
-      $block->title = t("Language Preference");
-      $block->content = new View("user_languages_block.html");
-      $block->content->installed_locales =
-        array_merge(array("" => t("« none »")), $locales);
-      $block->content->selected = (string) user::cookie_locale();
-      return $block;
-    }
-  }
-}
+}
\ No newline at end of file