api

druphliu · Mar 6, 2016 · 57c33c5 · 57c33c5
1 parent 0d50f08
commit 57c33c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/api/api_news.php b/api/api_news.php
@@ -91,6 +91,7 @@
                 C::t('news_viewer')->insert($addviewer);
             }
         }
+        $news['dateline'] = dgmdate($news[dateline],'u');
         $data = $news;
         $message = 'success';
         break;
@@ -112,7 +113,7 @@ function catList($catid = 0,$sql,$param)
     $params = array('news');
     $params[] = 'news_viewer';
     $params[] = $_G['uid'];
-    $params = array_merge_recursive($params,$param);
+    $params = $param ? array_merge_recursive($params, $param) : $params;
     foreach (C::t('news_cat')->fetch_all_by_pid($catid) as $value) {
         $catids = $common='';
         $result[$value['catid']] = $value;

diff --git a/data/cache/smilies_var.js b/data/cache/smilies_var.js
diff --git a/user/class/class_user.php b/user/class/class_user.php
@@ -325,7 +325,7 @@ function api_login()
 				if (empty($_GET['handlekey']) || !empty($_GET['lssubmit'])) {
 					if (defined('IN_MOBILE')) {
 						json_success(lang($loginmessage),$data);
-					} else {echo 2;
+					} else {
 						if (!empty($_GET['lssubmit'])) {
 
 							json_success(lang($loginmessage),$data);
@@ -376,6 +376,8 @@ function api_logout()
 	}
 
 	function api_userInfo(){
+		global $_G;
+		$uid = $_GET['uid'];
 		json_success('success',array('uid'=>2,'username'=>'test','token'=>111));
 	}
 }