Вывод html-части статьи, а нет txt

This commit is contained in:
Krivchikov Dmitry 2015-09-11 11:43:08 +03:00
parent cc16b420d2
commit 56995ae2e7
3 changed files with 5 additions and 9 deletions

View File

@ -429,7 +429,7 @@ class JsonController extends Controller
}
self::renderPartial('modals/article.php', array(
'title' => $article->title,
'text' => $article->text,
'text' => $article->html,
));
}
}
@ -443,7 +443,7 @@ class JsonController extends Controller
}
self::renderPartial('modals/pointAgreement.php', array(
'title' => $article->title,
'text' => $article->text,
'text' => $article->html,
));
}

View File

@ -193,10 +193,8 @@ class PageController extends Controller
}
App::setConfig('title', $article->title . ' - wikipoints.ru');
$article->text = Helper::replaceLinks($article->text, 'html');
$article->text = Helper::replaceImgs($article->text, 'html');
$article->text = Markdown::processing($article->text);
$article->text = nl2br($article->text);
$article->html = Helper::replaceLinks($article->html, 'html');
$article->html = Helper::replaceImgs($article->html, 'html');
self::render('article.php', array(
'article' => $article,

View File

@ -8,9 +8,7 @@
</div>
<div style="text-align: justify;">
<?php
print $article->text;
?>
<?= $article->html; ?>
</div>
</div>