Authored by biao

Merge branch 'hotfix/relatedBrand'

... ... @@ -180,9 +180,11 @@ class InfoController extends AbstractAction
// 相关品牌
if (!empty($detail['getBrand'])) {
$data['relatedBrand'] = $detail['getBrand'];
foreach ($data['relatedBrand'] as &$value) {
$value['thumb'] = strtr($value['thumb'], array('http://' => '//'));
foreach ($data['relatedBrand'] as $key => $value) {
$data['relatedBrand'][$key]['thumb'] = strtr($value['thumb'], array('http://' => '//'));
}
}
// 相关标签
... ... @@ -223,6 +225,7 @@ class InfoController extends AbstractAction
// 标识有微信分享
$data['hasWxShare'] = true;
$this->_view->display('index', $data);
$detail = array();
... ... @@ -356,6 +359,7 @@ class InfoController extends AbstractAction
$data['relatedBrand'] = $detail['getBrand'];
}
// 分享参数
if (isset($detail['getArticle']['cover_image'])) {
$data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang');
... ...