Authored by xiaofeng.yao@yoho.cn

Merge branch 'release'

... ... @@ -34,7 +34,7 @@ $this->title = '管理后台首页';
<script>
$(function(){
$('#import').click(function(){
$('#import').live("click",function(){
var offset = $('#offset').val();
var limit = $('#limit').val();
var loading_html = "<img src='/images/loaders/loader6.gif'>";
... ...
... ... @@ -100,7 +100,7 @@ class LivingController extends BaseController
$keys[] = sprintf("%s:online_nums_room_%s",Yii::$app->params['cache_prefix'],$row['room_id']);
}
$values = call_user_func_array(array(Yii::$app->redisIm,'mget'), $keys);
$keys ? call_user_func_array(array(Yii::$app->redisIm,'mget'), $keys) : [];
foreach ($values as $k=>$value){
$_ret[$k]['audience_num'] = (int)($value ? : $_ret[$k]['audience_num']);
}
... ... @@ -183,7 +183,7 @@ class LivingController extends BaseController
foreach ($_ret as $k=>$row){
$keys[] = sprintf("%svideo_id_%s_audience_num",Yii::$app->params['cache_prefix'],$row['video_id']);
}
$values = call_user_func_array(array(Yii::$app->redis,'mget'), $keys);
$keys ? call_user_func_array(array(Yii::$app->redis,'mget'), $keys) : [];
foreach ($values as $k=>$value){
$_ret[$k]['audience_num'] = (int)($value ? : $_ret[$k]['audience_num']);
}
... ...