From 6835442ba280d23a2802064ec6a00494fedbbe66 Mon Sep 17 00:00:00 2001 From: Jesse Hofmann-Smith Date: Wed, 11 May 2016 17:30:04 -0700 Subject: [PATCH] reroll patch #8 against 1.3 --- link.module | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/link.module b/link.module index b0c53c3..7512a09 100644 --- a/link.module +++ b/link.module @@ -493,27 +493,20 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) { $type = LINK_EXTERNAL; } $url = link_cleanup_url($item['url']); - $url_parts = _link_parse_url($url); - - if (!empty($url_parts['url'])) { - $item['url'] = $url_parts['url']; - $item += array( - 'query' => isset($url_parts['query']) ? $url_parts['query'] : NULL, - 'fragment' => isset($url_parts['fragment']) ? $url_parts['fragment'] : NULL, - 'absolute' => !empty($instance['settings']['absolute_url']), - 'html' => TRUE, + $item['url'] = url($url, + array( + 'absolute' => !empty($instance['settings']['absolute_url']), + 'html' => TRUE, + ) ); - } // Create a shortened URL for display. if ($type == LINK_EMAIL) { $display_url = str_replace('mailto:', '', $url); } else { - $display_url = url($url_parts['url'], + $display_url = url($url, array( - 'query' => isset($url_parts['query']) ? $url_parts['query'] : NULL, - 'fragment' => isset($url_parts['fragment']) ? $url_parts['fragment'] : NULL, 'absolute' => !empty($instance['settings']['absolute_url']), ) ); -- 2.7.0