diff --git a/upload/source/function/function_space.php b/upload/source/function/function_space.php index 4115ea46af0138d3e505d468dd6c6245c9d87f17..88a2d8c724422340dc63f42b2eebb6ac10b903c4 100644 --- a/upload/source/function/function_space.php +++ b/upload/source/function/function_space.php @@ -271,10 +271,8 @@ function getblockhtml($blockname,$parameters = array()) { $data_blogfield = C::t('home_blogfield')->fetch_all($bids); } foreach($data_blog as $curblogid => $value) { + $value = array_merge($value, (array)$data_blogfield[$curblogid]); if(ckfriend($value['uid'], $value['friend'], $value['target_ids'])) { - if($parameters['showmessage'] > 0) { - $value = array_merge($value, (array)$data_blogfield[$curblogid]); - } if($value['pic']) $value['pic'] = pic_cover_get($value['pic'], $value['picflag']); $value['message'] = $value['friend'] == 4 ? '' : getstr($value['message'], $parameters['showmessage'], 0, 0, 0, -1); $html .= lang('space', 'blog_li', array( @@ -312,8 +310,8 @@ function getblockhtml($blockname,$parameters = array()) { $blogids = array_keys($data_blog); $data_blogfield = C::t('home_blogfield')->fetch_all($blogids); foreach($data_blog as $curblogid => $value) { + $value = array_merge($value, (array)$data_blogfield[$curblogid]); if(ckfriend($value['uid'], $value['friend'], $value['target_ids'])) { - $value = array_merge($value, (array)$data_blogfield[$curblogid]); if($value['pic']) $value['pic'] = pic_cover_get($value['pic'], $value['picflag']); $value['message'] = $value['friend'] == 4 ? '' : getstr($value['message'], $parameters['showmessage'], 0, 0, 0, -1); $html .= lang('space', 'blog_li', array(