From e81bb0f9673f60b5a70de3d1b2d6bdfe23dc787a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 19 Jun 2012 15:51:41 +0200 Subject: [PATCH] Properly handle mutated vowels in links --- root/portal/modules/portal_links.php | 2 +- root/portal/modules/portal_main_menu.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/root/portal/modules/portal_links.php b/root/portal/modules/portal_links.php index 932eac83..fb7a95a9 100644 --- a/root/portal/modules/portal_links.php +++ b/root/portal/modules/portal_links.php @@ -219,7 +219,7 @@ class portal_links_module $link_title = utf8_normalize_nfc(request_var('link_title', ' ', true)); $link_type = request_var('link_type', 2); // default to B3_LINK_EXT, no categories in Links block - $link_url = request_var('link_url', ' '); + $link_url = utf8_normalize_nfc(request_var('link_url', ' ', true)); $link_url = str_replace('&', '&', $link_url); $link_permission = request_var('permission-setting-link', array(0 => '')); $groups_ary = array(); diff --git a/root/portal/modules/portal_main_menu.php b/root/portal/modules/portal_main_menu.php index 755d350a..f19ba43e 100644 --- a/root/portal/modules/portal_main_menu.php +++ b/root/portal/modules/portal_main_menu.php @@ -276,7 +276,7 @@ class portal_main_menu_module $link_title = utf8_normalize_nfc(request_var('link_title', ' ', true)); $link_is_cat = request_var('link_is_cat', false); $link_type = (!$link_is_cat) ? request_var('link_type', self::LINK_INT) : self::LINK_CAT; - $link_url = ($link_is_cat) ? ' ' : request_var('link_url', ' '); + $link_url = ($link_is_cat) ? ' ' : utf8_normalize_nfc(request_var('link_url', ' ', true)); $link_url = str_replace('&', '&', $link_url); $link_permission = request_var('permission-setting-menu', array(0 => '')); $groups_ary = array();