Merge branch 'master' of git@github.com:gallery/gallery3

2 files changed, 4 insertions, 8 deletions

diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index f8773a2e..c9d92e69 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -19,11 +19,7 @@
  */
 class server_add_installer {
   static function install() {
-    $db = Database::instance();
-    $version = module::get_version("server_add");
-    if ($version == 0) {
-      module::set_version("server_add", 1);
-    }
+    module::set_version("server_add", 1);
     server_add::check_config();
   }
 
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 4f307a2e..3df57ee4 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,7 +20,7 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (user::active()->admin) {
-      return html::script("modules/server_add/js/server_add.js");
+      $theme->script("modules/server_add/js/server_add.js");
     }
   }
 
@@ -33,8 +33,8 @@ class server_add_theme_Core {
       $csrf = access::csrf_token();
       $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $head[] = html::script("lib/jquery.autocomplete.js");
-      $head[] = html::script("modules/server_add/js/admin.js");
+      $theme->script("lib/jquery.autocomplete.js");
+      $theme->script("modules/server_add/js/admin.js");
     }
 
     return implode("\n", $head);