cas_translated_menu_link_alter overrides destination query strings on menu items

The code below in cas.module (7.x-1.6) at line 455 over writes url querystring data with the current page or current page destination in all menus.

If you wanted to have a menu item that had url of cas?destination=node/4 which displayed to anonymous users, and when clicked redirected them to cas login, and then back to node/4 on successful login, the above mentioned code prevents it.

This hook_alter changes the destination parameter of every menu links with a URL of "cas", to "cas?" plus the result of drupal_get_destintation().

drupal_get_destination() checks for a query string on the current node url via GET, it does not look at the menu item array to see if the array had a destintation set. So if the anonymous user is on node/12 with no destination, all the cas?destination menu items are changed to "cas?destination=node/12". Or if the user is on node/12?destination=node/13, the menu items are replaced with cas?destination=node/13.

I am sure there was a valid reason for this override, but it does not make sense to me to apply it to all menu items globally and disrupt the normal flow of the ?destination= query string which is present in drupal core.

If there is a need to redirect all "cas" urls in menu items somewhere on the way back, then the function should check the $item['options']['query']['destination'] is empty before replacing it in the localized options with the results of drupal_get_destination().

/**
 * Implements hook_translated_menu_item_alter().
 *
 * Append dynamic query 'destination' to several menu items.
 */
function cas_translated_menu_link_alter(&$item) {
  if (strtolower($item['href']) == 'cas') {
    $item['localized_options']['query'] = drupal_get_destination();
  }
  elseif (strtolower($item['href']) == 'caslogout' && !variable_get('cas_logout_destination', '')) {
    $item['localized_options']['query'] = drupal_get_destination();
  }
}