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

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 02f99690..2ba2e167 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,20 +20,20 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (user::active()->admin) {
-      $theme->script("modules/server_add/js/server_add.js");
+      $theme->script("server_add.js");
     }
   }
 
   static function admin_head($theme) {
     $head = array();
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
-      $theme->css("lib/jquery.autocomplete.css");
+      $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
       $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $theme->script("lib/jquery.autocomplete.js");
-      $theme->script("modules/server_add/js/admin.js");
+      $theme->script("jquery.autocomplete.js");
+      $theme->script("admin.js");
     }
 
     return implode("\n", $head);