|
@@ -115,9 +115,7 @@ class BTemplateLogLogic extends BaseLogic |
|
@@ -115,9 +115,7 @@ class BTemplateLogLogic extends BaseLogic |
|
115
|
$this->fail('当前数据不存在,或已被删除');
|
115
|
$this->fail('当前数据不存在,或已被删除');
|
|
116
|
}
|
116
|
}
|
|
117
|
if(empty($info['other'])){
|
117
|
if(empty($info['other'])){
|
|
118
|
- $commonTemplateModel = new BTemplateCommon();
|
|
|
|
119
|
- $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id'],'type'=>1]);
|
|
|
|
120
|
- $info['other'] = $commonInfo['other'];
|
118
|
+ $info['other'] = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));;
|
|
121
|
}
|
119
|
}
|
|
122
|
$html = $info['head_css'].$info['main_css'].$info['footer_css'].$info['other'].
|
120
|
$html = $info['head_css'].$info['main_css'].$info['footer_css'].$info['other'].
|
|
123
|
$info['head_html'].$info['main_html'].$info['footer_html'];
|
121
|
$info['head_html'].$info['main_html'].$info['footer_html'];
|