Changeset 4924 for branches/2.11-stable/www/filemanager/directories/list_directories.jsp

Timestamp:

May 7, 2009, 1:56:24 PM (14 years ago)

Author:

Martin Svensson

Message:

Fixes #1306 File browser fails if wrong project is selected when browsing a directory shared to another project

File:

• branches/2.11-stable/www/filemanager/directories/list_directories.jsp (modified) (1 diff)

branches/2.11-stable/www/filemanager/directories/list_directories.jsp

@@ -103 +103 @@
   final Directory userHome = user.getHomeDirectory();
   final boolean readDirectories = sc.hasPermission(Permission.READ, Item.DIRECTORY);
-  final Directory root = Directory.getById(dc, SystemItems.getId(readDirectories ? Directory.ROOT : Directory.HOME)); 
-  Directory current = directoryId != 0 ? Directory.getById(dc, directoryId) : null;
+  final Directory root = Directory.getById(dc, SystemItems.getId(readDirectories ? Directory.ROOT : Directory.HOME));
+  
+  Directory current = null;
+  // Try to get current/last visited directory. If not successful, use default directory.
+  try
+  {
+    current = directoryId != 0 ? Directory.getById(dc, directoryId) : null;
+  }
+  catch (Throwable ex){}  
   if (current == null) current = userHome;
   if (current == null) current = root;