カスタム検索ウィジェット更新。

diff --git a/include/db/systemDb.php b/include/db/systemDb.php
index ab349ea..b4734be 100644 (file)
--- a/include/db/systemDb.php
+++ b/include/db/systemDb.php
@@ -1082,7 +1082,7 @@ class SystemDb extends BaseDb
                $initDt = $gEnvManager->getInitValueOfTimestamp();              // 日時初期化値
                $now = date("Y/m/d H:i:s");     // 現在日時
                
-               $queryStr  = 'SELECT DISTINCT pd_sub_id ';
+               $queryStr  = 'SELECT DISTINCT pd_sub_id, pn_meta_title ';
                $queryStr .= 'FROM _page_def LEFT JOIN _page_id ON pd_sub_id = pg_id AND pg_type = 1 ';// ページサブID
                $queryStr .=   'LEFT JOIN _page_info ON pd_id = pn_id AND pd_sub_id = pn_sub_id AND pn_deleted = false AND pn_language_id = \'\' ';             // ページ情報
                $queryStr .= 'WHERE pd_id = ? '; $params[] = $pageId;

diff --git a/widgets/custom_search/include/container/custom_searchWidgetContainer.php b/widgets/custom_search/include/container/custom_searchWidgetContainer.php
index 10b83ba..088b0e9 100644 (file)
--- a/widgets/custom_search/include/container/custom_searchWidgetContainer.php
+++ b/widgets/custom_search/include/container/custom_searchWidgetContainer.php
@@ -380,6 +380,7 @@ class custom_searchWidgetContainer extends BaseWidgetContainer
        function searchItemsLoop($index, $fetchedRow)
        {
                // コンテンツへのリンクを生成
+               $title = '';
                $linkUrl = '';
                $summary = '';          // コンテンツ概要
                $contentType = $fetchedRow['type'];
@@ -408,6 +409,10 @@ class custom_searchWidgetContainer extends BaseWidgetContainer
                                $ret = $this->_db->getSubPageIdByContent(M3_VIEW_TYPE_CONTENT, $contentId, $this->gEnv->getCurrentPageId(), $rows);
                                if ($ret){
                                        $pageSubId = $rows[0]['pd_sub_id'];
+                                       $pageTitle = $rows[0]['pn_meta_title'];
+       
+                                       // ページタイトルが設定されている場合は取得
+                                       if (!empty($pageTitle)) $title = $pageTitle;
                                        
                                        // ページへのURLを作成
                                        $linkUrl = $this->getUrl($this->gEnv->createPageUrl() . '?' . M3_REQUEST_PARAM_PAGE_SUB_ID . '=' . $pageSubId, true/*リンク用*/);
@@ -596,9 +601,9 @@ class custom_searchWidgetContainer extends BaseWidgetContainer
                        default:
                                break;
                }
-               $title = $fetchedRow['name'];
+               if (empty($title)) $title = $fetchedRow['name'];
                $escapedTitle = $this->convertToDispString($title);
-               $titleLink = $this->convertToDispString($fetchedRow['name']);
+               $titleLink = $this->convertToDispString($title);
                $escapedLinkUrl = $this->convertUrlToHtmlEntity($linkUrl);
                if (!empty($linkUrl)) $titleLink = '<a href="' . $escapedLinkUrl . '" >' . $titleLink . '</a>';