diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-02-06 19:52:54 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-02-06 19:52:54 +0000 |
| commit | 5511bb5f7a0890c1554b10ea982f32398a8f6088 (patch) | |
| tree | c107b86289d2c2e311d73a76b6c2759e9ea8214f | |
| parent | a781df421cc0fc9e40a32e465d641bf938e33cc7 (diff) | |
| download | brdo-5511bb5f7a0890c1554b10ea982f32398a8f6088.tar.gz brdo-5511bb5f7a0890c1554b10ea982f32398a8f6088.tar.bz2 | |
- Patch #214513 by Lynn: missing break-statement in system_send_email_action.
| -rw-r--r-- | includes/menu.inc | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 1e8817ac6..5064d2f6c 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -652,14 +652,14 @@ function _menu_link_translate(&$item) { _menu_item_localize($item, $map, TRUE); } - + // Allow other customizations - e.g. adding a page-specific query string to the // options array. For performance reasons we only invoke this hook if the link // has the 'alter' flag set in the options array. if (!empty($item['options']['alter'])) { drupal_alter('translated_menu_link', $item, $map); } - + return $map; } diff --git a/modules/system/system.module b/modules/system/system.module index 329cc03e3..4c3707659 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1639,6 +1639,7 @@ function system_send_email_action($object, $context) { case 'comment': $comment = $context['comment']; $node = node_load($comment->nid); + break; case 'user': // Because this is not an action of type 'user' the user // object is not passed as $object, but it will still be available |