内核更新，多余文件清理

2016-07-01 18:04:46 +08:00
parent a595f3a13e
commit 0398e5bd80
31 changed files with 426 additions and 551 deletions
--- a/application/user/controller/Profile.php
+++ b/application/user/controller/Profile.php
@@ -24,8 +24,13 @@ class Profile extends User{
 			}
 		}else{
 			$group['基础资料'] = $user->useredit;
+			$group['扩展信息'] = $user->userextend;

-			$info = $user->getInfo(session('user_auth.uid'));
+			$info = $user->where(array('uid'=>session('user_auth.uid')))->find();
+
+			if ($info->extend) {
+				$info = array_merge($info->toArray(), $info->extend->toArray());
+			}
 			$data = array(
 				'fieldGroup' => $group,
 				'info'       => $info