aboutsummaryrefslogtreecommitdiff
path: root/views/failsafe/messages
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-18 12:14:55 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-18 12:14:55 +0000
commita50a1937ca193ca10553e93c609351a396fe4942 (patch)
tree8e363053afa6d94e12caa2dd0283067b7ed97788 /views/failsafe/messages
parent961fc5a437c8d458884560485864d057aa807a25 (diff)
downloadelgg-a50a1937ca193ca10553e93c609351a396fe4942.tar.gz
elgg-a50a1937ca193ca10553e93c609351a396fe4942.tar.bz2
Added the autop function, replaced any references to nl2br
git-svn-id: https://code.elgg.org/elgg/trunk@1468 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/failsafe/messages')
-rw-r--r--views/failsafe/messages/exceptions/exception.php4
-rw-r--r--views/failsafe/messages/sanitisation/htaccess.php2
-rw-r--r--views/failsafe/messages/sanitisation/settings.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index c8c630f3b..0b280107f 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/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/failsafe/messages/sanitisation/htaccess.php b/views/failsafe/messages/sanitisation/htaccess.php
index 99bfe4159..bca1b3243 100644
--- a/views/failsafe/messages/sanitisation/htaccess.php
+++ b/views/failsafe/messages/sanitisation/htaccess.php
@@ -12,6 +12,6 @@
* @link http://elgg.org/
*/
- echo nl2br(elgg_echo('installation:error:htaccess'));
+ echo autop(elgg_echo('installation:error:htaccess'));
?>
<textarea cols="120" rows="30"><?php echo $vars['.htaccess']; ?></textarea> \ No newline at end of file
diff --git a/views/failsafe/messages/sanitisation/settings.php b/views/failsafe/messages/sanitisation/settings.php
index 798bfbd91..e4ea720a8 100644
--- a/views/failsafe/messages/sanitisation/settings.php
+++ b/views/failsafe/messages/sanitisation/settings.php
@@ -24,7 +24,7 @@
else
{
- echo nl2br(elgg_echo('installation:error:settings'));
+ echo autop(elgg_echo('installation:error:settings'));
?>
<div>
<h2><?php echo elgg_echo('installation:settings:dbwizard:prompt'); ?></h2>