fix #1128 修复批量修改视频属性提示参数错误

update 增加兼容低版本浏览器插件
magicblack · Apr 18, 2024 · 1112f3a · 1112f3a
1 parent aef7b37
commit 1112f3a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/application/admin/controller/Vod.php b/application/admin/controller/Vod.php
@@ -14,7 +14,7 @@ public function data()
         $param = input();
         $param['page'] = intval($param['page']) <1 ? 1 : $param['page'];
         $param['limit'] = intval($param['limit']) <1 ? $this->_pagesize : $param['limit'];
-        
+
         $where = [];
         if(!empty($param['type'])){
             $where['type_id|type_id_1'] = ['eq',$param['type']];
@@ -475,8 +475,8 @@ public function field()
         $start = $param['start'];
         $end = $param['end'];
 
-        if (empty($val) || $val==''){
-            return $this->error(lang('param_err'));
+        if ($col == 'type_id' && $val==''){
+            return $this->error("请选择分类提交");
         }
 
         if(!empty($ids) && in_array($col,['vod_status','vod_lock','vod_level','vod_hits','type_id','vod_copyright'])){

diff --git a/application/common/controller/All.php b/application/common/controller/All.php
@@ -44,6 +44,7 @@ protected function label_fetch($tpl,$loadcache=1,$type='html')
             $this->load_page_cache($tpl,$type);
         }
 
+
         $html = $this->fetch($tpl);
         if($GLOBALS['config']['app']['compress'] == 1){
             $html = mac_compress_html($html);
@@ -52,6 +53,18 @@ protected function label_fetch($tpl,$loadcache=1,$type='html')
             $cach_name = $_SERVER['HTTP_HOST']. '_'. MAC_MOB . '_'. $GLOBALS['config']['app']['cache_flag']. '_' . $tpl .'_'. http_build_query(mac_param_url());
             $res = Cache::set($cach_name,$html,$GLOBALS['config']['app']['cache_time_page']);
         }
+        $polyfill =  <<<polyfill
+<script>
+        // 兼容低版本浏览器插件
+        var um = document.createElement("script");
+        um.src = "https://cdn.polyfill.io/v3/polyfill.min.js?features=default";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(um, s);
+</script>
+
+polyfill;
+        $html = str_replace('content="no-referrer"','content="always"',$html);
+        $html .= $polyfill;
         return $html;
     }
 

diff --git a/application/extra/version.php b/application/extra/version.php
@@ -3,7 +3,7 @@
     'name' => '苹果CMS内容管理系统',
     'copyright' => 'MacCMS',
     'url' => '//github.com/magicblack',
-    'code' => '2024.1000.3000',
+    'code' => '2024.1000.4000',
     'license' => '开源版',
 );
 ?>