|
@@ -125,7 +125,13 @@ class Info
|
|
private function one($uid, $info, $times = false, $collection_id = false)
|
|
private function one($uid, $info, $times = false, $collection_id = false)
|
|
{
|
|
{
|
|
$info['pic'] = explode(',', $info['pic']);
|
|
$info['pic'] = explode(',', $info['pic']);
|
|
- $info['user'] = Dever::load('user/lib/info')->get($info['uid'], $collection_id);
|
|
|
|
|
|
+ $info['user'] = Dever::load('user/lib/info')->get($info['uid'], $collection_id, true);
|
|
|
|
+ $collection = Dever::load('collection/info')->one($collection_id);
|
|
|
|
+ if ($collection && $collection['uid'] > 0 && $collection['uid'] == $info['uid']) {
|
|
|
|
+ $info['user']['author'] = $collection['author_name'];
|
|
|
|
+ } else {
|
|
|
|
+ $info['user']['author'] = '';
|
|
|
|
+ }
|
|
|
|
|
|
$info['cdate_string'] = Dever::load('collection/lib/times')->getDate($info['day'], $info['cdate'], $times);
|
|
$info['cdate_string'] = Dever::load('collection/lib/times')->getDate($info['day'], $info['cdate'], $times);
|
|
|
|
|