4 files changed, 8 insertions, 8 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 592a14e3..5f061cd5 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -26,7 +26,7 @@ class Server_Add_Controller extends Controller {
 
     $view = new View("server_add_tree_dialog.html");
     $view->action = url::site("server_add/add_photo/$id");
-    $view->hidden = array("csrf" => access::csrf_token(), "base_url" => url::base(true));
+    $view->hidden = array("csrf" => access::csrf_token(), "base_url" => url::site("__ARGS__"));
     $view->parents = $item->parents();
     $view->album_title = $item->title;
 
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 5a5a032a..bdd71db3 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -23,7 +23,7 @@ class server_add_theme_Core {
     if (Router::$current_uri == "admin/server_add") {
       $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("lib/jquery.autocomplete.css") . "\" />";
-      $base = url::base(true);
+      $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
       $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
index 15f0f57c..c9654410 100644
--- a/modules/server_add/js/admin.js
+++ b/modules/server_add/js/admin.js
@@ -9,8 +9,8 @@ $("document").ready(function() {
 });
 
 function add_autocomplete() {
-  $("#gServerAddAdmin input:text").autocomplete(base_url + "admin/server_add/autocomplete",
-                                                {max: 256});
+  $("#gServerAddAdmin input:text").autocomplete(
+    base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
 }
 function ajaxify_add_form(options) {
   $("#gServerAddAdmin form").ajaxForm({
@@ -34,7 +34,7 @@ function add_onclick() {
   $(".gRemoveDir").click(function() {
     var parent = $(this).parent();
     $.post(
-      base_url + "admin/local_import/remove_path",
+      base_url.replace("__ARGS__", "admin/local_import/remove_path"),
       {csrf: csrf,
        path: parent.text().replace(/^\s\s*/, "").replace(/\s\s*$/, "")},
       function(data, textStatus) {
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index fe8c976a..d05c6285 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -53,7 +53,7 @@ function load_children(icon, callback) {
           data: parms,
           dataType: "html",
           type: "POST",
-          url: base_url + "server_add/children"
+          url: base_url.replace("__ARGS__", "server_add/children")
   });
 }
 
@@ -70,7 +70,7 @@ function do_add(submit, event) {
   $.ajax({async: false,
     dataType: "json",
     type: "POST",
-    url: base_url + "server_add/start"
+          url: base_url.replace("__ARGS__", "server_add/start")
   });
   $.each(check_list, function () {
     process_checkbox(this);
@@ -81,7 +81,7 @@ function do_add(submit, event) {
     },
     dataType: "json",
     type: "POST",
-    url: base_url + "server_add/finish"
+    url: base_url.replace("__ARGS__", "server_add/finish")
   });
   return false;
 }