From 1d763db5fde4cf69e38575bee82af202a567ebd5 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 8 Mar 2016 13:15:26 +0900 Subject: [PATCH] Fix #320 again: Always use local path if file exists --- modules/member/member.model.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 73e08166c..073b7ab5b 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -1051,9 +1051,13 @@ class memberModel extends member $info->title = $group_info->title; $info->description = $group_info->description; $info->src = $group_info->image_mark; - if(parse_url($info->src, PHP_URL_HOST) === parse_url(Context::getDefaultUrl(), PHP_URL_HOST)) + if(preg_match('@^https?://@', $info->src)) { - $info->src = preg_replace('@^https?://[^/]+@i', '', $info->src); + $localpath = str_replace('/./', '/', parse_url($info->src, PHP_URL_PATH)); + if(file_exists($_SERVER['DOCUMENT_ROOT'] . $localpath)) + { + $info->src = $localpath . '?' . date('YmdHis', filemtime($_SERVER['DOCUMENT_ROOT'] . $localpath)); + } } $GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info; break;