From af5594a5c8e3c493297807df8721251f0d4ccbf0 Mon Sep 17 00:00:00 2001 From: reine Date: Sun, 25 Aug 2013 11:44:55 +0900 Subject: [PATCH] =?utf8?q?FIX:=20=E5=85=88=E3=81=AEcreateLink=E9=96=A2?= =?utf8?q?=E6=95=B0=E4=BF=AE=E6=AD=A3=E6=99=82=E3=81=ABGenerateURL?= =?utf8?q?=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=95=E3=81=AA=E3=81=84?= =?utf8?q?=E5=A0=B4=E5=90=88=E3=81=AE=E5=87=A6=E7=90=86=E3=81=AB=E3=81=8A?= =?utf8?q?=E3=81=84=E3=81=A6=E8=80=83=E6=85=AE=E6=BC=8F=E3=82=8C=E3=81=97?= =?utf8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nucleus/libs/globalfunctions.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php index e351697..29c86a0 100755 --- a/nucleus/libs/globalfunctions.php +++ b/nucleus/libs/globalfunctions.php @@ -1574,58 +1574,58 @@ function createLink($type, $params) { switch ($type) { case 'item': if ($usePathInfo) { - $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $args['itemid']; + $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $params['itemid']; } else { - $url = $CONF['ItemURL'] . '?itemid=' . $args['itemid']; + $url = $CONF['ItemURL'] . '?itemid=' . $params['itemid']; } break; case 'member': if ($usePathInfo) { - $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $args['memberid']; + $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $params['memberid']; } else { - $url = $CONF['MemberURL'] . '?memberid=' . $args['memberid']; + $url = $CONF['MemberURL'] . '?memberid=' . $params['memberid']; } break; case 'category': if ($usePathInfo) { - $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $args['catid']; + $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $params['catid']; } else { - $url = $CONF['CategoryURL'] . '?catid=' . $args['catid']; + $url = $CONF['CategoryURL'] . '?catid=' . $params['catid']; } break; case 'archivelist': - if (!$args['blogid']) { - $args['blogid'] = $CONF['DefaultBlog']; + if (!$params['blogid']) { + $params['blogid'] = $CONF['DefaultBlog']; } if ($usePathInfo) { - $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $args['blogid']; + $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $params['blogid']; } else { - $url = $CONF['ArchiveListURL'] . '?archivelist=' . $args['blogid']; + $url = $CONF['ArchiveListURL'] . '?archivelist=' . $params['blogid']; } break; case 'archive': if ($usePathInfo) { - $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$args['blogid'].'/' . $args['archive']; + $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$params['blogid'].'/' . $params['archive']; } else { - $url = $CONF['ArchiveURL'] . '?blogid='.$args['blogid'].'&archive=' . $args['archive']; + $url = $CONF['ArchiveURL'] . '?blogid='.$params['blogid'].'&archive=' . $params['archive']; } break; case 'blog': if ($usePathInfo) { - $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $args['blogid']; + $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $params['blogid']; } else { - $url = $CONF['BlogURL'] . '?blogid=' . $args['blogid']; + $url = $CONF['BlogURL'] . '?blogid=' . $params['blogid']; } break; } - return addLinkParams($url, (isset($args['extra'])? $args['extra'] : null)); + return addLinkParams($url, (isset($params['extra'])? $params['extra'] : null)); } function createBlogLink($url, $params) { -- 2.11.0