From 5cf267cc4c4af79389276d786914cbb2b7a2ec25 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 10 Jul 2009 08:01:32 -0700
Subject: Fix a bug where we were not properly locating the parent album when
 adding a new album or photo.

Simplify the data structure that we pass down to
server_add_tree.html.php so that we just pass a file list and let it
do whatever it wants with it.
---
 modules/server_add/views/server_add_tree.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/server_add/views/server_add_tree.html.php')

diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index f8205a8b..74bc40e0 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -1,13 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($files as $file => $name): ?>
+<? foreach ($files as $file): ?>
 <? $id = substr(md5($file), 10) ?>
 <li id="file_<?= $id ?>" class="<?= is_file($file) ? "gFile" : "gDirectory gCollapsed ui-icon-left" ?>">
   <? if (is_dir($file)): ?>
   <span onclick="open_close_branch('<?=$file?>', '<?=$id?>')" class="ui-icon ui-icon-plus"></span>
   <? endif ?>
   <label>
-    <?= form::checkbox("path[]", p::clean($file), false, "onclick=click_node(this)") ?>
-    <?= p::clean($name) ?>
+    <?= form::checkbox("path[]", $file, false, "onclick=click_node(this)") ?>
+    <?= p::clean(basename($file)) ?>
   </label>
   <? if (is_dir($file)): ?>
   <ul id="tree_<?= $id ?>" style="display: none"></ul>
-- 
cgit v1.2.3