summaryrefslogtreecommitdiff
path: root/modules/organize
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2009-06-28 17:57:23 -0600
committerChad Kieffer <ckieffer@gmail.com>2009-06-28 17:57:23 -0600
commitbf79d4372cbaac63f4fee55dbba58bc19f52bc14 (patch)
treed648c5d7d455da63b36f795f010cc94d55fe3ee5 /modules/organize
parent2b804ebdcea2127ca481ae3fb25a33a3bc5a78c3 (diff)
parentce6d453b3f32af98e13b62fe10b62173c59bde44 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/organize')
-rw-r--r--modules/organize/helpers/organize_theme.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index 27f8cdb2..cddc48b6 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -20,11 +20,9 @@
class organize_theme {
static function head($theme) {
// @tdo remove the addition css and organize.js (just here to test)
- $script[] = html::script("modules/organize/js/organize_init.js");
- $script[] = html::script("modules/organize/js/organize.js");
- $script[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
+ $theme->script("modules/organize/js/organize_init.js");
+ $theme->script("modules/organize/js/organize.js");
+ return "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
url::file("modules/organize/css/organize.css") . "\" />";
- return implode("\n", $script);
- //return html::script("modules/organize/js/organize_init.js");
}
}