- 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, 11 insertions, 10 deletions

diff --git a/modules/legacy/legacy.module b/modules/legacy/legacy.module
index 52348c61c..39ffc8b8c 100644
--- a/modules/legacy/legacy.module
+++ b/modules/legacy/legacy.module
@@ -25,6 +25,17 @@ function legacy_menu($may_cache) {
   $items = array();
 
   if ($may_cache) {
+    // Map "taxonomy/page/or/52,97" to "taxonomy/term/52+97".
+    $items[] = array('path' => 'taxonomy/page', 'title' => t('taxonomy'),
+      'callback' => 'legacy_taxonomy_page',
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+
+    // Map "taxonomy/feed/or/52,97" to "taxonomy/term/52+97/0/feed".
+    $items[] = array('path' => 'taxonomy/feed', 'title' => t('taxonomy'),
+      'callback' => 'legacy_taxonomy_feed',
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+  }
+  else {
     // Map "node/view/52" to "node/52".
     $items[] = array('path' => 'node/view', 'title' => t('view'),
       'callback' => 'drupal_goto',
@@ -42,16 +53,6 @@ function legacy_menu($may_cache) {
       'callback' => 'drupal_goto',
       'callback arguments' => array('user/'. arg(2), NULL, NULL),
       'access' => TRUE, 'type' => MENU_CALLBACK);
-
-    // Map "taxonomy/page/or/52,97" to "taxonomy/term/52+97".
-    $items[] = array('path' => 'taxonomy/page', 'title' => t('taxonomy'),
-      'callback' => 'legacy_taxonomy_page',
-      'access' => TRUE, 'type' => MENU_CALLBACK);
-
-    // Map "taxonomy/feed/or/52,97" to "taxonomy/term/52+97/0/feed".
-    $items[] = array('path' => 'taxonomy/feed', 'title' => t('taxonomy'),
-      'callback' => 'legacy_taxonomy_feed',
-      'access' => TRUE, 'type' => MENU_CALLBACK);
   }
 
   return $items;