Index: modules/shortcut/shortcut.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 shortcut.admin.inc
--- modules/shortcut/shortcut.admin.inc	30 Jun 2010 15:12:59 -0000	1.14
+++ modules/shortcut/shortcut.admin.inc	11 Oct 2010 04:22:01 -0000
@@ -311,15 +311,17 @@ function shortcut_set_customize($form, &
  * Submit handler for shortcut_set_customize().
  */
 function shortcut_set_customize_submit($form, &$form_state) {
-  foreach ($form_state['values']['shortcuts'] as $group => $links) {
-    foreach ($links as $mlid => $data) {
-      $link = menu_link_load($mlid);
-      $link['hidden'] = $data['status'] == 'enabled' ? 0 : 1;
-      $link['weight'] = $data['weight'];
-      menu_link_save($link);
+  if (!empty($form_state['values']['shortcuts'])) {
+    foreach ($form_state['values']['shortcuts'] as $group => $links) {
+      foreach ($links as $mlid => $data) {
+        $link = menu_link_load($mlid);
+        $link['hidden'] = $data['status'] == 'enabled' ? 0 : 1;
+        $link['weight'] = $data['weight'];
+        menu_link_save($link);
+      }
     }
+    drupal_set_message(t('The shortcut set has been updated.'));
   }
-  drupal_set_message(t('The shortcut set has been updated.'));
 }
 
 /**