- Patch #8179 by JonBob: the legacy handlers and file upload previews were mistakenly cached when they cannot be. Attached patch fixes this as well as a reference to an undefined constant in legacy_menu().

1 files changed, 10 insertions, 8 deletions

diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 0d1092ba6..6cc4585a5 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -25,6 +25,14 @@ function upload_menu($may_cache) {
   $items = array();
 
   if ($may_cache) {
+    $items[] = array(
+      'path' => 'admin/upload', 'title' => t('uploads'),
+      'callback' => 'upload_admin',
+      'access' => user_access('access administration pages'),
+      'type' => MENU_NORMAL_ITEM
+    );
+  }
+  else {
     // Add handlers for previewing new uploads.
     if ($_SESSION['file_uploads']) {
       foreach ($_SESSION['file_uploads'] as $key => $file) {
@@ -32,18 +40,12 @@ function upload_menu($may_cache) {
         $items[] = array(
           'path' => $filename, 'title' => t('file download'),
           'callback' => 'upload_download',
-          'access' => true,
-          'type' => MENU_DYNAMIC_ITEM & MENU_HIDDEN
+          'access' => TRUE,
+          'type' => MENU_CALLBACK
         );
         $_SESSION['file_uploads'][$key]->_filename = $filename;
       }
     }
-    $items[] = array(
-      'path' => 'admin/upload', 'title' => t('uploads'),
-      'callback' => 'upload_admin',
-      'access' => user_access('access administration pages'),
-      'type' => MENU_NORMAL_ITEM
-    );
   }
 
   return $items;