summaryrefslogtreecommitdiff
path: root/modules/server_add
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2009-07-21 19:40:48 -0600
committerChad Kieffer <ckieffer@gmail.com>2009-07-21 19:40:48 -0600
commit63511316be51f193d37c4f3b9dd3455a9ab60de8 (patch)
tree74986ed982d37b06256d5d2501d609314ba52e4e /modules/server_add
parent7f9e71d8cdcf99267adc2b4a6332e379a0fca0fc (diff)
parentf533aee1cc71e8db739406859ac0cf43dce030ec (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add')
-rw-r--r--modules/server_add/views/admin_server_add.html.php2
-rw-r--r--modules/server_add/views/server_add_tree_dialog.html.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 588a9fca..30ab3536 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -11,7 +11,7 @@
<ul id="gPathList">
<? foreach ($paths as $id => $path): ?>
<li class="ui-icon-left">
- <a href="<?= url::site("admin/server_add/remove_path?path=$path&csrf=$csrf") ?>"
+ <a href="<?= url::site("admin/server_add/remove_path?path=$path&amp;csrf=$csrf") ?>"
id="icon_<?= $id?>"
class="gRemoveDir ui-icon ui-icon-trash">
X
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 21952849..a4eda3b9 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
var GET_CHILDREN_URL = "<?= url::site("server_add/children?path=__PATH__") ?>";
- var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&csrf=$csrf") ?>";
+ var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&amp;csrf=$csrf") ?>";
</script>
<div id="gServerAdd">