diff --git a/config/func.inc.php b/config/func.inc.php index 7368dbc6b..67ff1c780 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -326,7 +326,7 @@ $request_uri = Context::getRequestUri(); if(!$num_args) return $request_uri; - $url = Context::getUrl($num_args, $args_list); + $url = Context::getUrl($num_args, $args_list, null, false); if(!preg_match('/^http/i',$url)){ preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match); $url = Context::getUrl($num_args, $args_list, null, false); diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 308bfa4d3..e4414e05a 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -606,16 +606,24 @@ //$info = $oModuleModel->getModuleInfoXml($moduleName); $info = $oModuleModel->getModuleActionXml($moduleName); - $url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index); - if(empty($url)) $url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->admin_index_act); - if(empty($url)) $url = getNotEncodedUrl('', 'module', 'admin'); + $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index); + if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act); + if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin'); $dbInfo = Context::getDBInfo(); $args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl; $args->parent_srl = $requestArgs->parent_srl; $args->menu_srl = $requestArgs->menu_srl; $args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName); - $args->url = str_replace($dbInfo->default_url, '', $url); + //if now page is https... + if(strpos($url, 'https') !== false) + { + $args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url); + } + else + { + $args->url = str_replace($dbInfo->default_url, '', $url); + } $args->open_window = 'N'; $args->expand = 'N'; $args->normal_btn = '';