Added the autop function, replaced any references to nl2br

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

20 files changed, 23 insertions, 23 deletions

diff --git a/views/default/admin/main.php b/views/default/admin/main.php
index 84be45780..b6040a5c9 100644
--- a/views/default/admin/main.php
+++ b/views/default/admin/main.php
@@ -12,7 +12,7 @@
 	 */

 

 	// Description of what's going on

-		echo "<p>" . nl2br(elgg_echo("admin:description")) . "</p>";

+		echo "<p>" . autop(elgg_echo("admin:description")) . "</p>";

 		

 	

 		

diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index b4339f83a..b680bc039 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -12,7 +12,7 @@
 	 */
 
 	// Description of what's going on
-		echo "<p>" . nl2br(elgg_echo("admin:plugins:description")) . "</p>";
+		echo "<p>" . autop(elgg_echo("admin:plugins:description")) . "</p>";
 
 		$limit = get_input('limit', 10);
 		$offset = get_input('offset', 0);
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
index 8792431c2..202f493d5 100644
--- a/views/default/admin/site.php
+++ b/views/default/admin/site.php
@@ -14,7 +14,7 @@
 	global $CONFIG;
 	
 	// Description of what's going on
-		echo "<p>" . nl2br(elgg_echo("admin:site:description")) . "</p>";
+		echo "<p>" . autop(elgg_echo("admin:site:description")) . "</p>";
 	
 		echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
 ?>
\ No newline at end of file
diff --git a/views/default/admin/statistics.php b/views/default/admin/statistics.php
index 4c2035f0d..f79812b51 100644
--- a/views/default/admin/statistics.php
+++ b/views/default/admin/statistics.php
@@ -12,6 +12,6 @@
 
 	global $CONFIG;
 	
-	echo "<p>" . nl2br(elgg_echo("admin:statistics:description")) . "</p>";
+	echo "<p>" . autop(elgg_echo("admin:statistics:description")) . "</p>";
          
 ?>
\ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
index 2e5445628..d3d80e6f7 100644
--- a/views/default/admin/user.php
+++ b/views/default/admin/user.php
@@ -12,7 +12,7 @@
 	 */
 
 	// Description of what's going on
-		echo "<p>" . nl2br(elgg_echo("admin:user:description")) . "</p>";
+		echo "<p>" . autop(elgg_echo("admin:user:description")) . "</p>";
 	
 		echo elgg_view("admin/user_opt/adduser");
 		
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
diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php
index 88c8a925c..85ab99fd4 100644
--- a/views/default/output/longtext.php
+++ b/views/default/output/longtext.php
@@ -15,5 +15,5 @@
 	 * 

 	 */

 

-    echo nl2br($vars['value']);

+    echo autop($vars['value']);

 ?>
\ No newline at end of file
diff --git a/views/default/settings/install.php b/views/default/settings/install.php
index 8de795da4..17d263349 100644
--- a/views/default/settings/install.php
+++ b/views/default/settings/install.php
@@ -12,7 +12,7 @@
 	 * 

 	 */

 

-	echo "<p>" . nl2br(elgg_echo("installation:settings:description")) . "</p>";

+	echo "<p>" . autop(elgg_echo("installation:settings:description")) . "</p>";

 

 	echo elgg_view("settings/system",array("action" => "action/systemsettings/install"));

 

diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php
index 1b0ed11e8..22bbc8e8f 100644
--- a/views/default/usersettings/main.php
+++ b/views/default/usersettings/main.php
@@ -12,5 +12,5 @@
 	 */
 
 	// Description of what's going on
-		echo "<p>" . nl2br(elgg_echo("usersettings:description")) . "</p>";
+		echo "<p>" . autop(elgg_echo("usersettings:description")) . "</p>";
 ?>
\ No newline at end of file
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index 730950178..70dfc5e14 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -11,7 +11,7 @@
 	 */
 
 	// Description of what's going on
-		echo "<p>" . nl2br(elgg_echo("usersettings:plugins:description")) . "</p>";
+		echo "<p>" . autop(elgg_echo("usersettings:plugins:description")) . "</p>";
 
 		$limit = get_input('limit', 10);
 		$offset = get_input('offset', 0);
diff --git a/views/default/usersettings/statistics.php b/views/default/usersettings/statistics.php
index f01e48bc8..8ab6712c6 100644
--- a/views/default/usersettings/statistics.php
+++ b/views/default/usersettings/statistics.php
@@ -12,5 +12,5 @@
 
 	global $CONFIG;
 	
-	echo "<p>" . nl2br(elgg_echo("usersettings:statistics:description")) . "</p>";
+	echo "<p>" . autop(elgg_echo("usersettings:statistics:description")) . "</p>";
 ?>
\ No newline at end of file
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>
diff --git a/views/odd/messages/exceptions/exception.php b/views/odd/messages/exceptions/exception.php
index 86b5bba48..38afbee58 100644
--- a/views/odd/messages/exceptions/exception.php
+++ b/views/odd/messages/exceptions/exception.php
@@ -17,7 +17,7 @@
 	global $CONFIG;

 ?>

 <!-- 

-<?php echo get_class($vars['object']); ?>: <?php echo nl2br($vars['object']->getMessage()); ?>
+<?php echo get_class($vars['object']); ?>: <?php echo autop($vars['object']->getMessage()); ?>
 
 
 <?php if ($CONFIG->debug) { ?>
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index 7c5fc11d8..38732750a 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -25,5 +25,5 @@
 	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>

 	  <link><?php echo $vars['entity']->getURL(); ?></link>

 	  <title><![CDATA[<?php echo $title; ?>]]></title>

-	  <description><![CDATA[<?php echo (nl2br($vars['entity']->description)); ?>]]></description>

+	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>

 	</item>

diff --git a/views/rss/user/default.php b/views/rss/user/default.php
index 5d72b30df..edc8bcd17 100644
--- a/views/rss/user/default.php
+++ b/views/rss/user/default.php
@@ -17,6 +17,6 @@
 	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>

 	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>

 	  <link><?php echo $vars['entity']->getURL(); ?></link>

-	  <title><![CDATA[<?php echo (nl2br($vars['entity']->name)); ?>]]></title>

-	  <description><![CDATA[<?php echo (nl2br($vars['entity']->description)); ?>]]></description>

+	  <title><![CDATA[<?php echo (autop($vars['entity']->name)); ?>]]></title>

+	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>

 	</item>

diff --git a/views/xml/messages/exceptions/exception.php b/views/xml/messages/exceptions/exception.php
index 86b5bba48..38afbee58 100644
--- a/views/xml/messages/exceptions/exception.php
+++ b/views/xml/messages/exceptions/exception.php
@@ -17,7 +17,7 @@
 	global $CONFIG;

 ?>

 <!-- 

-<?php echo get_class($vars['object']); ?>: <?php echo nl2br($vars['object']->getMessage()); ?>
+<?php echo get_class($vars['object']); ?>: <?php echo autop($vars['object']->getMessage()); ?>
 
 
 <?php if ($CONFIG->debug) { ?>