Browse Source

采集时,导演、演员允许空格

magicblack 3 years ago
parent
commit
081bcb5aee
2 changed files with 10 additions and 6 deletions
  1. 6 2
      application/common.php
  2. 4 4
      application/common/model/Collect.php

+ 6 - 2
application/common.php

@@ -1215,9 +1215,13 @@ function mac_restore_htmlfilter($str) {
     return $str;
 }
 
-function mac_format_text($str)
+function mac_format_text($str, $allow_space = false)
 {
-    return str_replace(array('/',',','|','、',' ',',,,'),',',$str);
+    $finder = array('/', ',', '|', '、', ',,', ',,,');
+    if ($allow_space === false) {
+        $finder[] = ' ';
+    }
+    return str_replace($finder, ',', $str);
 }
 function mac_format_count($str)
 {

+ 4 - 4
application/common/model/Collect.php

@@ -494,10 +494,10 @@ class Collect extends Base {
 
                 $v['vod_class'] = mac_txt_merge($v['vod_class'],$v['type_name']);
 
-                $v['vod_actor'] = mac_format_text($v['vod_actor']);
-                $v['vod_director'] = mac_format_text($v['vod_director']);
-                $v['vod_class'] = mac_format_text($v['vod_class']);
-                $v['vod_tag'] = mac_format_text($v['vod_tag']);
+                $v['vod_actor'] = mac_format_text($v['vod_actor'], true);
+                $v['vod_director'] = mac_format_text($v['vod_director'], true);
+                $v['vod_class'] = mac_format_text($v['vod_class'], true);
+                $v['vod_tag'] = mac_format_text($v['vod_tag'], true);
 
                 $v['vod_plot_name'] = (string)$v['vod_plot_name'];
                 $v['vod_plot_detail'] = (string)$v['vod_plot_detail'];