diff options
| author | jhilden <jakobhilden@gmail.com> | 2009-06-29 16:03:45 -0400 |
|---|---|---|
| committer | jhilden <jakobhilden@gmail.com> | 2009-06-29 16:03:45 -0400 |
| commit | b31b3bd5bff4f8d5b5721e0fdd86579028a5b03a (patch) | |
| tree | 9baa2a301c1e26dcf872e0bbfbb09be34cb020d5 /modules/organize/helpers | |
| parent | eb82f6a64a6b4e0b4e18ca92689bd467cba6e1bd (diff) | |
| parent | 5de6de6a133c6c906ee63b5a2ab1b08bc14ca17e (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/organize/helpers')
| -rw-r--r-- | modules/organize/helpers/organize_installer.php | 5 | ||||
| -rw-r--r-- | modules/organize/helpers/organize_theme.php | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php index ea0f4e3d..22ca1793 100644 --- a/modules/organize/helpers/organize_installer.php +++ b/modules/organize/helpers/organize_installer.php @@ -19,9 +19,6 @@ */ class organize_installer { static function install() { - $version = module::get_version("organize"); - if ($version == 0) { - module::set_version("organize", 1); - } + module::set_version("organize", 1); } } 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"); } } |