From be2c53581f75d68ed047ed5734c52e4aca26f909 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 13 Sep 2021 14:33:21 +0900 Subject: [PATCH] Revert #1776 patch; use apparent_module_srl instead https://xetown.com/questions/1612784 --- modules/board/board.view.php | 6 ++--- modules/document/document.item.php | 39 ++++++++++++++++++------------ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 11a2b9da9..3de6811a0 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -339,7 +339,7 @@ class boardView extends board Context::set('update_view', $this->grant->update_view); // setup the document oject on context - $oDocument->add('module_srl', $this->module_srl); + $oDocument->add('apparent_module_srl', $this->module_srl); Context::set('oDocument', $oDocument); /** @@ -618,10 +618,10 @@ class boardView extends board } foreach ($document_list as $document) { - $module_srl = $document->get('origin_module_srl') ?: $document->get('module_srl'); + $module_srl = $document->get('module_srl'); if ($document->get('mid') === null) { - $document->add('module_srl', $this->module_info->module_srl); + $document->add('apparent_module_srl', $this->module_info->module_srl); $document->add('module_title', isset($map[$module_srl]) ? $map[$module_srl]->browser_title : $this->module_info->browser_title); $document->add('mid', isset($map[$module_srl]) ? $map[$module_srl]->mid : $this->module_info->mid); } diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 8b09e0d24..036459047 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -151,6 +151,7 @@ class documentItem extends BaseObject $this->adds($attribute); if(isset($attribute->module_srl)) { + $this->add('apparent_module_srl', $attribute->module_srl); $this->add('origin_module_srl', $attribute->module_srl); } @@ -833,18 +834,17 @@ class documentItem extends BaseObject return getFullUrl('', 'mid', $this->getDocumentMid(), 'document_srl', $this->get('document_srl')); } - function getTrackbackUrl() + /** + * @deprecated + */ + public function getTrackbackUrl() { - if(!$this->isExists()) - { - return; - } - // Generate a key to prevent spams - if($oTrackbackModel = getModel('trackback')) - { - return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid()); - } + } + + public function getUrl() + { + return getFullUrl('', 'mid', $this->getApparentMid(), 'document_srl', $this->get('document_srl')); } public function getTags() @@ -877,7 +877,7 @@ class documentItem extends BaseObject function isExtraVarsExists() { - $module_srl = $this->get('origin_module_srl') ?: $this->get('module_srl'); + $module_srl = $this->get('module_srl'); if(!$module_srl) { return false; @@ -888,7 +888,7 @@ class documentItem extends BaseObject function getExtraVars() { - $module_srl = $this->get('origin_module_srl') ?: $this->get('module_srl'); + $module_srl = $this->get('module_srl'); if(!$module_srl || !$this->document_srl) { return null; @@ -1554,9 +1554,19 @@ class documentItem extends BaseObject return $output->data; } + /** + * Returns the apparent mid. + * + * @return string + */ + function getApparentMid() + { + return ModuleModel::getMidByModuleSrl($this->get('apparent_module_srl') ?: $this->get('module_srl')); + } /** - * Returns the document's mid in order to construct SEO friendly URLs + * Returns the true mid. + * * @return string */ function getDocumentMid() @@ -1588,8 +1598,7 @@ class documentItem extends BaseObject */ function getModuleName() { - $module_srl = $this->get('origin_module_srl') ?: $this->get('module_srl'); - return ModuleModel::getModuleInfoByModuleSrl($module_srl)->browser_title; + return ModuleModel::getModuleInfoByModuleSrl($this->get('module_srl'))->browser_title; } function getBrowserTitle()