合并分支 'akun' 到 'master'

Akun



查看合并请求 !932

@@ -219,7 +219,7 @@ class DomainInfoLogic extends BaseLogic
         $unique_extend = [];
         $unique_extend = [];
         if(isset($this->param['extend_config']) && $this->param['extend_config']){
         if(isset($this->param['extend_config']) && $this->param['extend_config']){
             foreach ($this->param['extend_config'] as $k=>$v){
             foreach ($this->param['extend_config'] as $k=>$v){
-                if(!in_array($v['origin'],$unique_extend)){
+                if($v['origin'] && (!in_array($v['origin'],$unique_extend))){
                     $unique_extend[] = $v['origin'];
                     $unique_extend[] = $v['origin'];
                     $extend_config[] = $v;
                     $extend_config[] = $v;
                 }
                 }
@@ -230,7 +230,7 @@ class DomainInfoLogic extends BaseLogic
         $amp_unique_extend = [];
         $amp_unique_extend = [];
         if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
         if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
             foreach ($this->param['amp_extend_config'] as $ka=>$va){
             foreach ($this->param['amp_extend_config'] as $ka=>$va){
-                if(!in_array($va['origin'],$amp_unique_extend)){
+                if($va['origin'] && (!in_array($va['origin'],$amp_unique_extend))){
                     $amp_unique_extend[] = $va['origin'];
                     $amp_unique_extend[] = $va['origin'];
                     $amp_extend_config[] = $va;
                     $amp_extend_config[] = $va;
                 }
                 }