FIX: 先のcreateLink関数修正時にGenerateURLを呼び出さない場合の処理において考慮漏れしていたのを修正。

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index e351697..29c86a0 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -1574,58 +1574,58 @@ function createLink($type, $params) {
        switch ($type) {\r
                case 'item':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $args['itemid'];\r
+                               $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $params['itemid'];\r
                        } else {\r
-                               $url = $CONF['ItemURL'] . '?itemid=' . $args['itemid'];\r
+                               $url = $CONF['ItemURL'] . '?itemid=' . $params['itemid'];\r
                        }\r
                        break;\r
 \r
                case 'member':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $args['memberid'];\r
+                               $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $params['memberid'];\r
                        } else {\r
-                               $url = $CONF['MemberURL'] . '?memberid=' . $args['memberid'];\r
+                               $url = $CONF['MemberURL'] . '?memberid=' . $params['memberid'];\r
                        }\r
                        break;\r
 \r
                case 'category':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $args['catid'];\r
+                               $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $params['catid'];\r
                        } else {\r
-                               $url = $CONF['CategoryURL'] . '?catid=' . $args['catid'];\r
+                               $url = $CONF['CategoryURL'] . '?catid=' . $params['catid'];\r
                        }\r
                        break;\r
 \r
                case 'archivelist':\r
-                       if (!$args['blogid']) {\r
-                               $args['blogid'] = $CONF['DefaultBlog'];\r
+                       if (!$params['blogid']) {\r
+                               $params['blogid'] = $CONF['DefaultBlog'];\r
                        }\r
 \r
                        if ($usePathInfo) {\r
-                               $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $args['blogid'];\r
+                               $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $params['blogid'];\r
                        } else {\r
-                               $url = $CONF['ArchiveListURL'] . '?archivelist=' . $args['blogid'];\r
+                               $url = $CONF['ArchiveListURL'] . '?archivelist=' . $params['blogid'];\r
                        }\r
                        break;\r
 \r
                case 'archive':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$args['blogid'].'/' . $args['archive'];\r
+                               $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$params['blogid'].'/' . $params['archive'];\r
                        } else {\r
-                               $url = $CONF['ArchiveURL'] . '?blogid='.$args['blogid'].'&archive=' . $args['archive'];\r
+                               $url = $CONF['ArchiveURL'] . '?blogid='.$params['blogid'].'&archive=' . $params['archive'];\r
                        }\r
                        break;\r
 \r
                case 'blog':\r
                        if ($usePathInfo) {\r
-                               $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $args['blogid'];\r
+                               $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $params['blogid'];\r
                        } else {\r
-                               $url = $CONF['BlogURL'] . '?blogid=' . $args['blogid'];\r
+                               $url = $CONF['BlogURL'] . '?blogid=' . $params['blogid'];\r
                        }\r
                        break;\r
        }\r
 \r
-       return addLinkParams($url, (isset($args['extra'])? $args['extra'] : null));\r
+       return addLinkParams($url, (isset($params['extra'])? $params['extra'] : null));\r
 }\r
 \r
 function createBlogLink($url, $params) {\r