作者 刘锟

合并分支 'akun' 到 'master'

Akun



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