gx

@@ -118,10 +118,10 @@ class CustomTemplateLogic extends BaseLogic
         $bSettingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
         $bSettingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
         $info = $templateCommonModel->read(['template_id'=>$bSettingInfo['template_id'],'project_id'=>$this->user['project_id'],'type'=>$type]);
         $info = $templateCommonModel->read(['template_id'=>$bSettingInfo['template_id'],'project_id'=>$this->user['project_id'],'type'=>$type]);
         $data = [
         $data = [
-            'head_html'=>$param['head_html'],
-            'head_css'=>$param['head_css'],
-            'footer_html'=>$param['footer_html'],
-            'footer_css'=>$param['footer_css'],
+            'head_html'=>characterTruncation($param['html'],'/<header\b[^>]*>(.*?)<\/header>/s'),
+            'head_css'=>characterTruncation($param['html'],'/<style id="globalsojs-header">(.*?)<\/style>/s'),
+            'footer_html'=>characterTruncation($param['html'],'/<footer\b[^>]*>(.*?)<\/footer>/s'),
+            'footer_css'=>characterTruncation($param['html'],'/<style id="globalsojs-footer">(.*?)<\/style>/s'),
             'other'=>str_replace('<header','',characterTruncation($param['html'],"/<link id=\"google-fonts-link\"(.*?)<header/s")),
             'other'=>str_replace('<header','',characterTruncation($param['html'],"/<link id=\"google-fonts-link\"(.*?)<header/s")),
         ];
         ];
         if($info === false){
         if($info === false){