dever 4 年之前
父節點
當前提交
c61b086a8a
共有 2 個文件被更改,包括 16 次插入2 次删除
  1. 7 1
      app/community/lib/Info.php
  2. 9 1
      app/user/lib/Info.php

+ 7 - 1
app/community/lib/Info.php

@@ -125,7 +125,13 @@ class Info
     private function one($uid, $info, $times = false, $collection_id = false)
     {
         $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);
 

+ 9 - 1
app/user/lib/Info.php

@@ -49,7 +49,7 @@ class Info
     }
 
 	# 获取用户信息
-	public function get($user, $id)
+	public function get($user, $id, $author = false)
 	{
 		if (is_numeric($user)) {
 			if (isset($this->user[$user])) {
@@ -90,6 +90,14 @@ class Info
         $result['address_contact'] = $user['address_contact'] ? $user['address_contact'] : $user['username'];
         $result['address_mobile'] = $user['address_mobile'] ? $user['address_mobile'] : $user['mobile'];
 
+        if ($author) {
+            $collection = Dever::load('collection/lib/info')->get($id);
+            if ($collection && $collection['uid'] > 0 && $collection['uid'] == $info['uid']) {
+                $result['author'] = $collection['author_name'];
+            } else {
+                $result['author'] = '';
+            }
+        }
 		$this->user[$user['id']] = $result;
 		
 		return $result;