#610234 by Gábor Hojtsy, ksenzee, cwgordon7, David_Rothstein, seutje, marcvangend, sun, JoshuaRogers, markus_petrux, Bojhan, Rob Loach, Everett Zufelt, drifter, markboulton, leisareichelt, et al: Added Overlay module to core, which shows administrative pages in a JS overlay, retaining context on the front-end site.

1 files changed, 14 insertions, 0 deletions

diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module
index 92bd58c77..225cb8e32 100644
--- a/modules/shortcut/shortcut.module
+++ b/modules/shortcut/shortcut.module
@@ -330,6 +330,7 @@ function shortcut_set_assign_user($shortcut_set, $account) {
     ->key(array('uid' => $account->uid))
     ->fields(array('set_name' => $shortcut_set->set_name))
     ->execute();
+  drupal_static_reset('shortcut_current_displayed_set');
 }
 
 /**
@@ -600,3 +601,16 @@ function shortcut_preprocess_page(&$variables) {
     $variables['add_or_remove_shortcut'] = drupal_render($variables['page']['add_or_remove_shortcut']);
   }
 }
+
+/**
+ * Implements hook_system_info_alter().
+ *
+ * If the overlay module is enabled, indicate that the link for adding or
+ * removing shortcuts is one of the page "regions" that should display in the
+ * overlay.
+ */
+function shortcut_system_info_alter(&$info, $file, $type) {
+  if (module_exists('overlay') && $type == 'theme') {
+    $info['overlay_regions'][] = 'add_or_remove_shortcut';
+  }
+}