summaryrefslogtreecommitdiff
path: root/modules/server_add/views/admin_server_add.html.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-08-27 16:11:47 -0700
committerBharat Mediratta <bharat@menalto.com>2009-08-27 16:11:47 -0700
commit74363ced870d4114e7570729636875e0258917b3 (patch)
tree61bc27831a362994fc96ea90172d50e25d5c76cb /modules/server_add/views/admin_server_add.html.php
parent98e9a96ba4d2419e02717369be8c0d886bc35ef7 (diff)
parent4828db003f3ee505eb9e6d056cdb142da34b78ff (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD
Conflicts: modules/slideshow/helpers/slideshow_event.php
Diffstat (limited to 'modules/server_add/views/admin_server_add.html.php')
-rw-r--r--modules/server_add/views/admin_server_add.html.php2
1 files changed, 1 insertions, 1 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