Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 4 insertions, 2 deletions

diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 2ba2e167..84f28df2 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -19,7 +19,8 @@
  */
 class server_add_theme_Core {
   static function head($theme) {
-    if (user::active()->admin) {
+    if (identity::active_user()->admin) {
+      $theme->css("server_add.css");
       $theme->script("server_add.js");
     }
   }
@@ -27,10 +28,11 @@ class server_add_theme_Core {
   static function admin_head($theme) {
     $head = array();
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
+      $theme->css("server_add.css");
       $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
-      $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+      $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
       $theme->script("jquery.autocomplete.js");
       $theme->script("admin.js");