ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 03:30:48 +03:00
Code Issues Releases Wiki Activity

Оптимизация сохранения текста топика при отсутствии ката (поле text_short не заполняется)

Browse source
This commit is contained in:
Mzhelskiy Maxim 2014-12-19 14:15:39 +07:00
parent 2d0e1685e1
commit 366106771a
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
application/classes/actions/ActionContent.class.php
View file

@ -321,7 +321,11 @@ class ActionContent extends Action
$oTopic->setCutText($sTextCut);
// TODO: передача параметров в Topic_Parser пока не используется - нужно заменить на этот вызов все места с парсингом топика
$oTopic->setText($this->Topic_Parser($sTextNew, $oTopic));
$oTopic->setTextShort($this->Topic_Parser($sTextShort, $oTopic));
if ($sTextShort!=$sTextNew) {
$oTopic->setTextShort($this->Topic_Parser($sTextShort, $oTopic));
} else {
$oTopic->setTextShort('');
}
} else {
$oTopic->setCutText('');
$oTopic->setText('');
@ -450,7 +454,11 @@ class ActionContent extends Action
list($sTextShort, $sTextNew, $sTextCut) = $this->Text_Cut($oTopic->getTextSource());
$oTopic->setCutText($sTextCut);
$oTopic->setText($this->Topic_Parser($sTextNew, $oTopic));
$oTopic->setTextShort($this->Topic_Parser($sTextShort, $oTopic));
if ($sTextShort!=$sTextNew) {
$oTopic->setTextShort($this->Topic_Parser($sTextShort, $oTopic));
} else {
$oTopic->setTextShort('');
}
} else {
$oTopic->setCutText('');
$oTopic->setText('');

12
application/frontend/skin/developer/components/article/article.tpl
View file

@ -77,16 +77,16 @@
<div class="{$component}-content">
<div class="{$component}-text text">
{block 'article_content_text'}
{if $isList}
{$article->getTextShort()}
{else}
{$article->getText()}
{/if}
{if $isList and $article->getTextShort()}
{$article->getTextShort()}
{else}
{$article->getText()}
{/if}
{/block}
</div>
{* Кат *}
{if $isList && $article->getTextShort() != $article->getText()}
{if $isList && $article->getTextShort()}
{include 'components/button/button.tpl'
classes = "{$component}-cut"
url = "{$article->getUrl()}#cut"