作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !161
@@ -292,7 +292,7 @@ class HtmlCollect extends Command @@ -292,7 +292,7 @@ class HtmlCollect extends Command
292 $path_arr = explode('.', $path); 292 $path_arr = explode('.', $path);
293 if ( 293 if (
294 (empty($scheme) || $scheme == 'https' || $scheme == 'http') 294 (empty($scheme) || $scheme == 'https' || $scheme == 'http')
295 - (empty($host) || $host == $web_url_domain || $host == $home_url) 295 + && (empty($host) || $host == $web_url_domain || $host == $home_url)
296 && $path 296 && $path
297 && (strpos($path, '.') !== false) 297 && (strpos($path, '.') !== false)
298 && (!in_array(end($path_arr), ['html', 'php', 'com', 'xml'])) 298 && (!in_array(end($path_arr), ['html', 'php', 'com', 'xml']))
@@ -295,7 +295,7 @@ class HtmlLanguageCollect extends Command @@ -295,7 +295,7 @@ class HtmlLanguageCollect extends Command
295 $path_arr = explode('.', $path); 295 $path_arr = explode('.', $path);
296 if ( 296 if (
297 (empty($scheme) || $scheme == 'https' || $scheme == 'http') 297 (empty($scheme) || $scheme == 'https' || $scheme == 'http')
298 - (empty($host) || $host == $web_url_domain || $host == $home_url) 298 + && (empty($host) || $host == $web_url_domain || $host == $home_url)
299 && $path 299 && $path
300 && (strpos($path, '.') !== false) 300 && (strpos($path, '.') !== false)
301 && (!in_array(end($path_arr), ['html', 'php', 'com', 'xml'])) 301 && (!in_array(end($path_arr), ['html', 'php', 'com', 'xml']))