From 30ea03aaf73f5510953e1c6818820f148a331176 Mon Sep 17 00:00:00 2001 From: webchick Date: Sun, 17 Mar 2013 12:17:33 -0700 Subject: [PATCH] Issue #1926958 by amateescu, maciej.zgadzaj, dawehner: Fixed (Regression) menu_link_save() no longer returns success/failure to calling functions. --- core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php | 5 ++++- core/modules/menu_link/menu_link.module | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php index 654a00561cc..7188736bb4a 100644 --- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php +++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php @@ -82,7 +82,10 @@ class MenuTest extends WebTestBase { // Verify that a change to the description is saved. $description = $this->randomName(16); $item['options']['attributes']['title'] = $description; - menu_link_save($item); + $return_value = menu_link_save($item); + // Save the menu link again to test the return value of the procedural save + // helper. + $this->assertIdentical($return_value, $item->save(), 'Return value of menu_link_save() is identical to the return value of $menu_link->save().'); $saved_item = entity_load('menu_link', $item['mlid']); $this->assertEqual($description, $saved_item['options']['attributes']['title'], 'Saving an existing link updates the description (title attribute)'); $this->resetMenuLink($item, $old_title); diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module index ed11c78a6da..eb0bc0fcc40 100644 --- a/core/modules/menu_link/menu_link.module +++ b/core/modules/menu_link/menu_link.module @@ -115,9 +115,13 @@ function menu_link_delete_multiple(array $mlids, $force = FALSE, $prevent_repare * * @param \Drupal\menu_link\Plugin\Core\Entity\MenuLink $menu_link * The menu link entity to be saved. + * + * @return int|bool + * Returns SAVED_NEW or SAVED_UPDATED if the save operation succeeded, or + * FALSE if it failed. */ function menu_link_save(MenuLink $menu_link) { - $menu_link->save(); + return $menu_link->save(); } /**