OSDN Git Service
(root)
/
nucleus-jp
/
nucleus-jp-ancient.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d53bf68
)
FIX: 先のcreateLink関数修正時にGenerateURLを呼び出さない場合の処理において考慮漏れしていたのを修正。
author
reine
<reine@users.sourceforge.jp>
Sun, 25 Aug 2013 02:44:55 +0000
(11:44 +0900)
committer
reine
<reine@users.sourceforge.jp>
Sun, 25 Aug 2013 02:44:55 +0000
(11:44 +0900)
nucleus/libs/globalfunctions.php
patch
|
blob
|
history
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
switch ($type) {
\r
case 'item':
\r
if ($usePathInfo) {
\r
- $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $
arg
s['itemid'];
\r
+ $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $
param
s['itemid'];
\r
} else {
\r
} else {
\r
- $url = $CONF['ItemURL'] . '?itemid=' . $
arg
s['itemid'];
\r
+ $url = $CONF['ItemURL'] . '?itemid=' . $
param
s['itemid'];
\r
}
\r
break;
\r
\r
case 'member':
\r
if ($usePathInfo) {
\r
}
\r
break;
\r
\r
case 'member':
\r
if ($usePathInfo) {
\r
- $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $
arg
s['memberid'];
\r
+ $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $
param
s['memberid'];
\r
} else {
\r
} else {
\r
- $url = $CONF['MemberURL'] . '?memberid=' . $
arg
s['memberid'];
\r
+ $url = $CONF['MemberURL'] . '?memberid=' . $
param
s['memberid'];
\r
}
\r
break;
\r
\r
case 'category':
\r
if ($usePathInfo) {
\r
}
\r
break;
\r
\r
case 'category':
\r
if ($usePathInfo) {
\r
- $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $
arg
s['catid'];
\r
+ $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $
param
s['catid'];
\r
} else {
\r
} else {
\r
- $url = $CONF['CategoryURL'] . '?catid=' . $
arg
s['catid'];
\r
+ $url = $CONF['CategoryURL'] . '?catid=' . $
param
s['catid'];
\r
}
\r
break;
\r
\r
case 'archivelist':
\r
}
\r
break;
\r
\r
case 'archivelist':
\r
- if (!$
arg
s['blogid']) {
\r
- $
arg
s['blogid'] = $CONF['DefaultBlog'];
\r
+ if (!$
param
s['blogid']) {
\r
+ $
param
s['blogid'] = $CONF['DefaultBlog'];
\r
}
\r
\r
if ($usePathInfo) {
\r
}
\r
\r
if ($usePathInfo) {
\r
- $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $
arg
s['blogid'];
\r
+ $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $
param
s['blogid'];
\r
} else {
\r
} else {
\r
- $url = $CONF['ArchiveListURL'] . '?archivelist=' . $
arg
s['blogid'];
\r
+ $url = $CONF['ArchiveListURL'] . '?archivelist=' . $
param
s['blogid'];
\r
}
\r
break;
\r
\r
case 'archive':
\r
if ($usePathInfo) {
\r
}
\r
break;
\r
\r
case 'archive':
\r
if ($usePathInfo) {
\r
- $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$
args['blogid'].'/' . $arg
s['archive'];
\r
+ $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$
params['blogid'].'/' . $param
s['archive'];
\r
} else {
\r
} else {
\r
- $url = $CONF['ArchiveURL'] . '?blogid='.$
args['blogid'].'&archive=' . $arg
s['archive'];
\r
+ $url = $CONF['ArchiveURL'] . '?blogid='.$
params['blogid'].'&archive=' . $param
s['archive'];
\r
}
\r
break;
\r
\r
case 'blog':
\r
if ($usePathInfo) {
\r
}
\r
break;
\r
\r
case 'blog':
\r
if ($usePathInfo) {
\r
- $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $
arg
s['blogid'];
\r
+ $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $
param
s['blogid'];
\r
} else {
\r
} else {
\r
- $url = $CONF['BlogURL'] . '?blogid=' . $
arg
s['blogid'];
\r
+ $url = $CONF['BlogURL'] . '?blogid=' . $
param
s['blogid'];
\r
}
\r
break;
\r
}
\r
\r
}
\r
break;
\r
}
\r
\r
- return addLinkParams($url, (isset($
args['extra'])? $arg
s['extra'] : null));
\r
+ return addLinkParams($url, (isset($
params['extra'])? $param
s['extra'] : null));
\r
}
\r
\r
function createBlogLink($url, $params) {
\r
}
\r
\r
function createBlogLink($url, $params) {
\r