summaryrefslogtreecommitdiff
path: root/modules/server_add/controllers/server_add.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-04-09 19:39:26 +0000
committerTim Almdal <tnalmdal@shaw.ca>2009-04-09 19:39:26 +0000
commit91bc1292da0c4e01c475272a64030bb8097367b0 (patch)
tree55a9fec99e7e28e5a014f4e00be9a9c2a73f5ec7 /modules/server_add/controllers/server_add.php
parent49042345f60c58a55c52fc02ac4ee25bac16b4ce (diff)
Don't try to import the staging directory as an album
Diffstat (limited to 'modules/server_add/controllers/server_add.php')
-rw-r--r--modules/server_add/controllers/server_add.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 45c81519..85b0b4ec 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -73,7 +73,7 @@ class Server_Add_Controller extends Controller {
foreach (array_keys($paths) as $valid_path) {
$path_length = strlen($valid_path);
foreach ($input_files as $key => $path) {
- if ($path_valid = strpos($path, $valid_path) === 0) {
+ if ($valid_path != $path && strpos($path, $valid_path) === 0) {
$relative_path = substr(dirname($path), $path_length);
$name = basename($path);
$files[$valid_path][] = array("path" => $relative_path,