Merge branch 'master' of git://github.com/gallery/gallery3

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 2afa93a7..ea8907f4 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -286,7 +286,7 @@ class Server_Add_Controller extends Admin_Controller {
           } catch (Exception $e) {
             // This can happen if a photo file is invalid, like a BMP masquerading as a .jpg
             $entry->item_id = 0;
-            $task->log("Skipping invalid file: {$entry->file}");
+            $task->log("Skipping invalid file: {$entry->path}");
           }
         }