From e83e82f8d32e0ccc606301adccc48f6290901f4a Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 14 Jun 2020 20:31:57 +0900 Subject: [PATCH] Update Context::getUrl() to use Router --- classes/context/Context.class.php | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 2bf76bda4..5c0c397cc 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1725,35 +1725,7 @@ class Context $query = ''; if(count($get_vars) > 0) { - // if using rewrite mod - if($rewrite_level) - { - $var_keys = array_keys($get_vars); - sort($var_keys); - $target = join('.', $var_keys); - $act = $get_vars['act']; - $mid = $get_vars['mid']; - $key = $get_vars['key']; - $srl = $get_vars['document_srl']; - $tmpArray = array('rss' => 1, 'atom' => 1, 'api' => 1); - $is_feed = isset($tmpArray[$act]); - $target_map = array( - 'mid' => $mid, - 'category.mid' => "$mid/category/" . $get_vars['category'], - 'entry.mid' => "$mid/entry/" . $get_vars['entry'], - 'document_srl' => $srl, - 'document_srl.mid' => "$mid/$srl", - 'act' => ($is_feed && $act !== 'api') ? $act : '', - 'act.mid' => $is_feed ? "$mid/$act" : '', - 'act.document_srl.key' => ($act == 'trackback') ? "$srl/$key/$act" : '', - 'act.document_srl.key.mid' => ($act == 'trackback') ? "$mid/$srl/$key/$act" : '', - ); - $query = $target_map[$target]; - } - if(!$query && count($get_vars) > 0) - { - $query = 'index.php?' . http_build_query($get_vars); - } + $query = Rhymix\Framework\Router::getURLFromArguments($get_vars, $rewrite_level); } // If using SSL always