diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-01-15 13:14:43 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-01-15 13:14:43 -0800 |
| commit | ee13b934f46d67982e5eeea21f81ac58f166741c (patch) | |
| tree | 3a37f19253d2f6ae17b5e190a85c6b48b0de95d5 /modules/user | |
| parent | 38b74932878e8e0c7eb071552568bbb014355996 (diff) | |
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.
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/helpers/user_theme.php | 8 |
1 files changed, 4 insertions, 4 deletions
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 |