diff --git a/View/Elements/entry_footer.ctp b/View/Elements/entry_footer.ctp index 5dc2b95..4229d13 100644 --- a/View/Elements/entry_footer.ctp +++ b/View/Elements/entry_footer.ctp @@ -1,8 +1,9 @@
- - NetCommonsHtml->url(array( + NetCommonsHtml->url(array( 'action' => 'view', 'frame_id' => Current::read('Frame.id'), 'key' => $blogEntry['BlogEntry']['key'], diff --git a/View/Helper/BlogOgpHelper.php b/View/Helper/BlogOgpHelper.php index 582a0ce..492ca76 100644 --- a/View/Helper/BlogOgpHelper.php +++ b/View/Helper/BlogOgpHelper.php @@ -169,7 +169,8 @@ private function __convertFullUrl($imageUrl) { // ルートパス if (substr($imageUrl, 0, 1) === '/') { // "/" はじまりならルートパスなのでhttpホスト名を追加する - $imageUrl = FULL_BASE_URL . $imageUrl; + $urlPrefix = parse_url(Configure::read('App.fullBaseUrl'), PHP_URL_SCHEME) . '://'; + $imageUrl = $urlPrefix . Configure::read('App.cacheDomain') . $imageUrl; return $imageUrl; } @@ -197,6 +198,11 @@ private function __getOgImageParams($content) { $ogpParams = []; if (preg_match_all($pattern, $content, $images)) { foreach ($images[1] as $imageUrl) { + //インライン画像の場合、処理しない + if (substr($imageUrl, 0, 4) === 'data') { + continue; + } + $imageUrl = $this->__convertFullUrl($imageUrl); $imageUrl = str_replace('&', '&', $imageUrl); @@ -263,10 +269,8 @@ private function __getWysiwygSmallImageUrl($imageUrl) { * @return bool */ private function __isWysiwygImage($imageUrl) { - if (strstr($imageUrl, FULL_BASE_URL . '/wysiwyg/image/download') !== false) { - return true; - } - return false; + $fullBaseUrl = Configure::read('App.fullBaseUrl'); + return strstr($imageUrl, $fullBaseUrl . '/wysiwyg/image/download') !== false; } /** @@ -278,7 +282,8 @@ private function __isWysiwygImage($imageUrl) { private function __getOgpParams($blogEntry) { $ogpParams = []; $ogpParams['og:title'] = $blogEntry['BlogEntry']['title']; - $contentUrl = FULL_BASE_URL . $this->NetCommonsHtml->url( + $urlPrefix = parse_url(Configure::read('App.fullBaseUrl'), PHP_URL_SCHEME) . '://'; + $contentUrl = $urlPrefix . Configure::read('App.cacheDomain') . $this->NetCommonsHtml->url( array( 'action' => 'view', 'frame_id' => Current::read('Frame.id'),