Added the autop function, replaced any references to nl2br

git-svn-id: https://code.elgg.org/elgg/trunk@1468 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 4 insertions, 4 deletions

diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php
index 078e25949..ddcd0009c 100644
--- a/views/default/messages/errors/error.php
+++ b/views/default/messages/errors/error.php
@@ -16,5 +16,5 @@
 ?>

 

 	<p>

-		<?php echo nl2br($vars['object']); ?>

+		<?php echo autop($vars['object']); ?>

 	</p>
\ No newline at end of file
diff --git a/views/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php
index 8df557b48..f56927123 100644
--- a/views/default/messages/exceptions/exception.php
+++ b/views/default/messages/exceptions/exception.php
@@ -21,7 +21,7 @@
 		<span title="<?php echo get_class($vars['object']); ?>">

 		<?php

 

-			echo nl2br($vars['object']->getMessage());

+			echo autop($vars['object']->getMessage());

 		

 		?>

 		</span>

@@ -32,7 +32,7 @@
 	<p class="messages-exception-detail">
 		<?php
 
-			echo nl2br(htmlentities(print_r($vars['object'], true)));
+			echo autop(htmlentities(print_r($vars['object'], true)));
 		
 		?>
 	</p>
diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php
index 1622c29e8..355afeb15 100644
--- a/views/default/messages/messages/message.php
+++ b/views/default/messages/messages/message.php
@@ -16,5 +16,5 @@
 ?>

 

 	<p>

-		<?php echo nl2br($vars['object']); ?>

+		<?php echo autop($vars['object']); ?>

 	</p>
\ No newline at end of file