Changeset 3711 for branches

Timestamp:

Sep 6, 2007, 9:47:52 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #736: Incorrect error message is displayed if a file upload fails

Location:

branches/2.4-stable/www

Files:

• exception/exception.jsp (modified) (1 diff)
• filemanager/upload/show_exception.jsp (modified) (1 diff)

branches/2.4-stable/www/exception/exception.jsp

@@ -121 +121 @@
       Main.hide('goback');
     }
-    if (window.opener != null)
+    if (window.top != null && window.top.opener != null)
     {
       // popup window --> Hide menubar

branches/2.4-stable/www/filemanager/upload/show_exception.jsp

@@ -51 +51 @@
 sc.setSessionSetting("FileUploadProgress", null);
 sc.setSessionSetting("UnpackProgress", null);
-throw progress.getException();
+if (progress.getException() != null) throw progress.getException();
 %>