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.

7 files changed, 38 insertions, 39 deletions

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index b993cdae..9cc93fa1 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,14 +19,12 @@
  */
 class comment_theme_Core {
   static function head($theme) {
-    $theme->css("comment.css");
-    $theme->script("comment.js");
-    return "";
+    return $theme->css("comment.css")
+      . $theme->script("comment.js");
   }
 
   static function admin_head($theme) {
-    $theme->css("comment.css");
-    return "";
+    return $theme->css("comment.css");
   }
 
   static function photo_bottom($theme) {
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index d146e17d..1106910e 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,6 +19,6 @@
  */
 class digibug_theme_Core {
   static function head($theme) {
-    $theme->script("digibug.js");
+    return $theme->script("digibug.js");
   }
 }
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 978c69a6..ebf8f38e 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,9 +21,9 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
-    $theme->css("gallery.css");
+    $buf .= $theme->css("gallery.css");
     if ($session->get("debug")) {
-      $theme->css("debug.css");
+      $buf .= $theme->css("debug.css");
     }
 
     if (module::is_active("rss")) {
@@ -40,32 +40,33 @@ class gallery_theme_Core {
 
     if (count(locales::installed())) {
       // Needed by the languages block
-      $theme->script("jquery.cookie.js");
+      $buf .= $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");
+      $buf .= $theme->css("l10n_client.css")
+        . $theme->script("jquery.cookie.js")
+        . $theme->script("l10n_client.js");
     }
 
-    $theme->css("uploadify/uploadify.css");
+    $buf .= $theme->css("uploadify/uploadify.css");
     return $buf;
   }
 
   static function admin_head($theme) {
-    $theme->css("gallery.css");
-    $theme->script("gallery.panel.js");
+    $buf = $theme->css("gallery.css");
+    $buf .= $theme->script("gallery.panel.js");
     $session = Session::instance();
     if ($session->get("debug")) {
-      $theme->css("debug.css");
+      $buf .= $theme->css("debug.css");
     }
 
     if ($session->get("l10n_mode", false)) {
-      $theme->css("l10n_client.css");
-      $theme->script("jquery.cookie.js");
-      $theme->script("l10n_client.js");
+      $buf .= $theme->css("l10n_client.css");
+      $buf .= $theme->script("jquery.cookie.js");
+      $buf .=$theme->script("l10n_client.js");
     }
+    return $buf;
   }
 
   static function page_bottom($theme) {
diff --git a/modules/recaptcha/helpers/recaptcha_theme.php b/modules/recaptcha/helpers/recaptcha_theme.php
index ee880986..3677a7c7 100644
--- a/modules/recaptcha/helpers/recaptcha_theme.php
+++ b/modules/recaptcha/helpers/recaptcha_theme.php
@@ -19,10 +19,10 @@
  */
 class recaptcha_theme_Core {
   static function head($theme) {
-    $theme->css("recaptcha.css");
+    return $theme->css("recaptcha.css");
   }
 
   static function admin_head($theme) {
-    $theme->css("recaptcha.css");
+    return $theme->css("recaptcha.css");
   }
 }
\ No newline at end of file
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
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index f731dbb7..3325a832 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,13 +19,13 @@
  */
 class tag_theme_Core {
   static function head($theme) {
-    $theme->css("jquery.autocomplete.css");
-    $theme->script("jquery.autocomplete.js");
-    $theme->css("tag.css");
+    return $theme->css("jquery.autocomplete.css")
+      . $theme->script("jquery.autocomplete.js")
+      . $theme->css("tag.css");
   }
 
   static function admin_head($theme) {
-    $theme->css("tag.css");
-    $theme->script("gallery.in_place_edit.js");
+    return $theme->css("tag.css")
+      . $theme->script("gallery.in_place_edit.js");
   }
 }
\ No newline at end of file
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 5a7161ed..70e96f70 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,12 +19,12 @@
  */
 class user_theme_Core {
   static function head($theme) {
-    $theme->css("user.css");
-    $theme->script("password_strength.js");
+    return $theme->css("user.css")
+      . $theme->script("password_strength.js");
   }
 
   static function admin_head($theme) {
-    $theme->css("user.css");
-    $theme->script("password_strength.js");
+    return $theme->css("user.css")
+      . $theme->script("password_strength.js");
   }
 }
\ No newline at end of file