diff --git a/classes/actions/ActionTopic.class.php b/classes/actions/ActionTopic.class.php index f54bb0ce..5bf6bfe8 100644 --- a/classes/actions/ActionTopic.class.php +++ b/classes/actions/ActionTopic.class.php @@ -379,20 +379,21 @@ class ActionTopic extends Action { $sText=$this->Text_Parser(getRequest('topic_text')); /** * Создаёт анонс топика(обрезаем по тег ) - */ + */ $sTestShort=$sText; $sTestNew=$sText; $sTextTemp=str_replace("\r\n",'[]',$sText); $sTextTemp=str_replace("\n",'[]',$sTextTemp); if (preg_match("/^(.*)(.*)$/Ui",$sTextTemp,$aMatch)) { - $sTestShort=$aMatch[1]; - $sTestNew=$aMatch[1].' '.$aMatch[3]; + $sTestShort=$aMatch[1]; + $sTestShort=str_replace('[]',"\r\n",$sTestShort); + $sTestShort=str_replace('[]',"\r\n",$sTestShort); + $sTestShort=$this->Text_Parser($sTestShort); + $sTestNew=$aMatch[1].' '.$aMatch[3]; if (preg_match('/^\s*name\s*=\s*"(.+)"\s*$/Ui',$aMatch[2],$aMatchCut)) { $oTopic->setCutText(trim($aMatchCut[1])); } - } - $sTestShort=str_replace('[]',"\r\n",$sTestShort); - $sTestShort=str_replace('[]',"\r\n",$sTestShort); + } $sTestNew=str_replace('[]',"\r\n",$sTestNew); $sTestNew=str_replace('[]',"\r\n",$sTestNew); @@ -531,14 +532,15 @@ class ActionTopic extends Action { $sTextTemp=str_replace("\r\n",'[]',$sText); $sTextTemp=str_replace("\n",'[]',$sTextTemp); if (preg_match("/^(.*)(.*)$/Ui",$sTextTemp,$aMatch)) { - $sTestShort=$aMatch[1]; + $sTestShort=$aMatch[1]; + $sTestShort=str_replace('[]',"\r\n",$sTestShort); + $sTestShort=str_replace('[]',"\r\n",$sTestShort); + $sTestShort=$this->Text_Parser($sTestShort); $sTestNew=$aMatch[1].' '.$aMatch[3]; if (preg_match('/^\s*name\s*=\s*"(.+)"\s*$/Ui',$aMatch[2],$aMatchCut)) { $oTopic->setCutText(trim($aMatchCut[1])); } - } - $sTestShort=str_replace('[]',"\r\n",$sTestShort); - $sTestShort=str_replace('[]',"\r\n",$sTestShort); + } $sTestNew=str_replace('[]',"\r\n",$sTestNew); $sTestNew=str_replace('[]',"\r\n",$sTestNew);