Skip to content

Commit

Permalink
Custom pages - remove nl2br()
Browse files Browse the repository at this point in the history
  • Loading branch information
RobiNN1 committed Mar 25, 2018
1 parent 7400800 commit be315c4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion includes/classes/PHPFusion/Page/PageController.inc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class PageController extends PageModel {
ob_end_clean();
$htmlArray['pagenav'] = '';
$htmlArray['rowstart'] = isset($_GET['rowstart']) && isnum($_GET['rowstart']) ? intval($_GET['rowstart']) : 0;
$htmlArray['body'] = preg_split("/<!?--\s*pagebreak\s*-->/i", (fusion_get_settings("tinymce_enabled") ? $eval : nl2br($eval)));
$htmlArray['body'] = preg_split("/<!?--\s*pagebreak\s*-->/i", (fusion_get_settings("tinymce_enabled") ? $eval : $eval));
$htmlArray['count'] = count($htmlArray['body']);
if ($htmlArray['count'] > 0) {
if ($htmlArray['rowstart'] > $htmlArray['count']) {
Expand Down
2 changes: 1 addition & 1 deletion widgets/block/block.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function display_widget($colData) {
<div<?php echo $block_class.$block_style ?>>
<h3><?php echo $blockData['block_title'] ?></h3>

<p><?php echo nl2br(parse_textarea($blockData['block_description'])) ?></p>
<p><?php echo parse_textarea($blockData['block_description']); ?></p>
</div>
<?php
return ob_get_clean();
Expand Down
2 changes: 1 addition & 1 deletion widgets/featurebox/featurebox.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function display_widget($colData) {
<!--//Icon-->
</div>
<h3><?php echo $boxData['box_title'] ?></h3>
<p><?php echo nl2br($boxData['box_description']) ?></p>
<p><?php echo $boxData['box_description']; ?></p>
<?php echo $box_link ?>
</div>
<?php
Expand Down

3 comments on commit be315c4

@ovasclub
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The text was connected to the pages.
Problem in includes/classes/PHPFusion/Page/PageController.inc

-4

@FrederickChan
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ovasclub , open new issue if the patch has problem

@RobiNN1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added toggler for this

Please sign in to comment.