dever 6 years ago
parent
commit
b1ecc889c5
2 changed files with 2 additions and 2 deletions
  1. 1 1
      video/database/live.php
  2. 1 1
      video/lib/Live.php

+ 1 - 1
video/database/live.php

@@ -58,7 +58,7 @@ $share = array
 	2 => '不显示',
 );
 
-$col = 'id,name,pic_cover,pic_cover_169,pdate,num_add_user+num_user as num_user,num_add_view+num_view as num_view,num_up+num_add_up as num_up,num_comment,share_yes,share_title,share_pic,share_content,function,content,url_m3u8,url_mp4, url_m3u8 as url,cate_id,stream_id,sdate,edate,author_id,video_info';
+$col = 'id,name,pic_cover,pic_cover_169,pdate,num_add_user+num_user as num_user,num_add_view+num_view as num_view,num_up+num_add_up as num_up,num_comment,share_yes,share_title,share_pic,share_content,function,content,url_m3u8,url_mp4, url_m3u8 as url,cate_id,stream_id,sdate,edate,author_id,video_info,stream_link';
 
 return array
 (

+ 1 - 1
video/lib/Live.php

@@ -31,7 +31,7 @@ class Live
                 $data['stream_hls'] = $stream['url_hls'];
                 $data['stream_hdl'] = $stream['url_hdl'];
                 $data['stream_pic'] = $stream['url_pic'];
-            } elseif ($data['stream_link']) {
+            } elseif (isset($data['stream_link']) && $data['stream_link']) {
                 $data['stream'] = $data['stream_link'];
                 $data['stream_rtmp'] = $data['stream_link'];
                 $data['stream_hls'] = $data['stream_link'];