Fix all the head() and admin_head() theme callbacks to return the

results of the $theme->css() and $theme->script() calls.  This handles
the case where combining scripts/css returns HTML instead of putting
it in the queue for combination.  Fixes #1611.

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 53f78772..6395c2f0 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,24 +20,24 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (identity::active_user()->admin) {
-      $theme->css("server_add.css");
-      $theme->script("server_add.js");
+      return $theme->css("server_add.css")
+        . $theme->script("server_add.js");
     }
   }
 
   static function admin_head($theme) {
-    $head = array();
+    $buf = "";
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
-      $theme->css("server_add.css");
-      $theme->css("jquery.autocomplete.css");
+      $buf .= $theme->css("server_add.css")
+        . $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
-      $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+      $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $theme->script("jquery.autocomplete.js");
-      $theme->script("admin.js");
+      $buf .= $theme->script("jquery.autocomplete.js")
+        . $theme->script("admin.js");
     }
 
-    return implode("\n", $head);
+    return $buf;
   }
 }
\ No newline at end of file