• R/O
  • HTTP
  • SSH
  • HTTPS

nucleus-jp-ancient: Commit

Nucleus CMS日本語版SVNをgit-svnしたもの。リポジトリの変換作業用


Commit MetaInfo

Revisionaf5594a5c8e3c493297807df8721251f0d4ccbf0 (tree)
Time2013-08-25 11:44:55
Authorreine <reine@user...>
Commiterreine

Log Message

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

Change Summary

Incremental Difference

--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -1574,58 +1574,58 @@ function createLink($type, $params) {
15741574 switch ($type) {
15751575 case 'item':
15761576 if ($usePathInfo) {
1577- $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $args['itemid'];
1577+ $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $params['itemid'];
15781578 } else {
1579- $url = $CONF['ItemURL'] . '?itemid=' . $args['itemid'];
1579+ $url = $CONF['ItemURL'] . '?itemid=' . $params['itemid'];
15801580 }
15811581 break;
15821582
15831583 case 'member':
15841584 if ($usePathInfo) {
1585- $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $args['memberid'];
1585+ $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $params['memberid'];
15861586 } else {
1587- $url = $CONF['MemberURL'] . '?memberid=' . $args['memberid'];
1587+ $url = $CONF['MemberURL'] . '?memberid=' . $params['memberid'];
15881588 }
15891589 break;
15901590
15911591 case 'category':
15921592 if ($usePathInfo) {
1593- $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $args['catid'];
1593+ $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $params['catid'];
15941594 } else {
1595- $url = $CONF['CategoryURL'] . '?catid=' . $args['catid'];
1595+ $url = $CONF['CategoryURL'] . '?catid=' . $params['catid'];
15961596 }
15971597 break;
15981598
15991599 case 'archivelist':
1600- if (!$args['blogid']) {
1601- $args['blogid'] = $CONF['DefaultBlog'];
1600+ if (!$params['blogid']) {
1601+ $params['blogid'] = $CONF['DefaultBlog'];
16021602 }
16031603
16041604 if ($usePathInfo) {
1605- $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $args['blogid'];
1605+ $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $params['blogid'];
16061606 } else {
1607- $url = $CONF['ArchiveListURL'] . '?archivelist=' . $args['blogid'];
1607+ $url = $CONF['ArchiveListURL'] . '?archivelist=' . $params['blogid'];
16081608 }
16091609 break;
16101610
16111611 case 'archive':
16121612 if ($usePathInfo) {
1613- $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$args['blogid'].'/' . $args['archive'];
1613+ $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$params['blogid'].'/' . $params['archive'];
16141614 } else {
1615- $url = $CONF['ArchiveURL'] . '?blogid='.$args['blogid'].'&amp;archive=' . $args['archive'];
1615+ $url = $CONF['ArchiveURL'] . '?blogid='.$params['blogid'].'&amp;archive=' . $params['archive'];
16161616 }
16171617 break;
16181618
16191619 case 'blog':
16201620 if ($usePathInfo) {
1621- $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $args['blogid'];
1621+ $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $params['blogid'];
16221622 } else {
1623- $url = $CONF['BlogURL'] . '?blogid=' . $args['blogid'];
1623+ $url = $CONF['BlogURL'] . '?blogid=' . $params['blogid'];
16241624 }
16251625 break;
16261626 }
16271627
1628- return addLinkParams($url, (isset($args['extra'])? $args['extra'] : null));
1628+ return addLinkParams($url, (isset($params['extra'])? $params['extra'] : null));
16291629 }
16301630
16311631 function createBlogLink($url, $params) {
Show on old repository browser