fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert #1776 patch; use apparent_module_srl instead

Browse source 
https://xetown.com/questions/1612784
This commit is contained in:
Kijin Sung 2021-09-13 14:33:21 +09:00
parent 76cc70bbb3
commit be2c53581f
2 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/board/board.view.php
View file

@ -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);
}

39
modules/document/document.item.php
View file

@ -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()