| Revisão | af5594a5c8e3c493297807df8721251f0d4ccbf0 (tree) |
|---|---|
| Hora | 2013-08-25 11:44:55 |
| Autor | reine <reine@user...> |
| Commiter | reine |
FIX: 先のcreateLink関数修正時にGenerateURLを呼び出さない場合の処理において考慮漏れしていたのを修正。
nucleus/libs/globalfunctions.php (diff)| @@ -1574,58 +1574,58 @@ function createLink($type, $params) { | ||
| 1574 | 1574 | switch ($type) { |
| 1575 | 1575 | case 'item': |
| 1576 | 1576 | if ($usePathInfo) { |
| 1577 | - $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $args['itemid']; | |
| 1577 | + $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $params['itemid']; | |
| 1578 | 1578 | } else { |
| 1579 | - $url = $CONF['ItemURL'] . '?itemid=' . $args['itemid']; | |
| 1579 | + $url = $CONF['ItemURL'] . '?itemid=' . $params['itemid']; | |
| 1580 | 1580 | } |
| 1581 | 1581 | break; |
| 1582 | 1582 | |
| 1583 | 1583 | case 'member': |
| 1584 | 1584 | if ($usePathInfo) { |
| 1585 | - $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $args['memberid']; | |
| 1585 | + $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $params['memberid']; | |
| 1586 | 1586 | } else { |
| 1587 | - $url = $CONF['MemberURL'] . '?memberid=' . $args['memberid']; | |
| 1587 | + $url = $CONF['MemberURL'] . '?memberid=' . $params['memberid']; | |
| 1588 | 1588 | } |
| 1589 | 1589 | break; |
| 1590 | 1590 | |
| 1591 | 1591 | case 'category': |
| 1592 | 1592 | if ($usePathInfo) { |
| 1593 | - $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $args['catid']; | |
| 1593 | + $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $params['catid']; | |
| 1594 | 1594 | } else { |
| 1595 | - $url = $CONF['CategoryURL'] . '?catid=' . $args['catid']; | |
| 1595 | + $url = $CONF['CategoryURL'] . '?catid=' . $params['catid']; | |
| 1596 | 1596 | } |
| 1597 | 1597 | break; |
| 1598 | 1598 | |
| 1599 | 1599 | case 'archivelist': |
| 1600 | - if (!$args['blogid']) { | |
| 1601 | - $args['blogid'] = $CONF['DefaultBlog']; | |
| 1600 | + if (!$params['blogid']) { | |
| 1601 | + $params['blogid'] = $CONF['DefaultBlog']; | |
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | 1604 | if ($usePathInfo) { |
| 1605 | - $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $args['blogid']; | |
| 1605 | + $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $params['blogid']; | |
| 1606 | 1606 | } else { |
| 1607 | - $url = $CONF['ArchiveListURL'] . '?archivelist=' . $args['blogid']; | |
| 1607 | + $url = $CONF['ArchiveListURL'] . '?archivelist=' . $params['blogid']; | |
| 1608 | 1608 | } |
| 1609 | 1609 | break; |
| 1610 | 1610 | |
| 1611 | 1611 | case 'archive': |
| 1612 | 1612 | if ($usePathInfo) { |
| 1613 | - $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$args['blogid'].'/' . $args['archive']; | |
| 1613 | + $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$params['blogid'].'/' . $params['archive']; | |
| 1614 | 1614 | } else { |
| 1615 | - $url = $CONF['ArchiveURL'] . '?blogid='.$args['blogid'].'&archive=' . $args['archive']; | |
| 1615 | + $url = $CONF['ArchiveURL'] . '?blogid='.$params['blogid'].'&archive=' . $params['archive']; | |
| 1616 | 1616 | } |
| 1617 | 1617 | break; |
| 1618 | 1618 | |
| 1619 | 1619 | case 'blog': |
| 1620 | 1620 | if ($usePathInfo) { |
| 1621 | - $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $args['blogid']; | |
| 1621 | + $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $params['blogid']; | |
| 1622 | 1622 | } else { |
| 1623 | - $url = $CONF['BlogURL'] . '?blogid=' . $args['blogid']; | |
| 1623 | + $url = $CONF['BlogURL'] . '?blogid=' . $params['blogid']; | |
| 1624 | 1624 | } |
| 1625 | 1625 | break; |
| 1626 | 1626 | } |
| 1627 | 1627 | |
| 1628 | - return addLinkParams($url, (isset($args['extra'])? $args['extra'] : null)); | |
| 1628 | + return addLinkParams($url, (isset($params['extra'])? $params['extra'] : null)); | |
| 1629 | 1629 | } |
| 1630 | 1630 | |
| 1631 | 1631 | function createBlogLink($url, $params) { |
Fork