Showing
1 changed file
with
0 additions
and
4 deletions
| @@ -1090,11 +1090,7 @@ class Helpers | @@ -1090,11 +1090,7 @@ class Helpers | ||
| 1090 | { | 1090 | { |
| 1091 | return preg_match("/[\x7f-\xff]/", $str); | 1091 | return preg_match("/[\x7f-\xff]/", $str); |
| 1092 | } | 1092 | } |
| 1093 | -<<<<<<< HEAD | ||
| 1094 | 1093 | ||
| 1095 | -======= | ||
| 1096 | - | ||
| 1097 | ->>>>>>> master | ||
| 1098 | /** | 1094 | /** |
| 1099 | * 将首字符为//的url转换为http:// | 1095 | * 将首字符为//的url转换为http:// |
| 1100 | * | 1096 | * |
-
Please register or login to post a comment