aboutsummaryrefslogtreecommitdiff
path: root/views/default/admin
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/default/admin
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/default/admin')
-rw-r--r--views/default/admin/main.php2
-rw-r--r--views/default/admin/plugins.php2
-rw-r--r--views/default/admin/site.php2
-rw-r--r--views/default/admin/statistics.php2
-rw-r--r--views/default/admin/user.php2
5 files changed, 5 insertions, 5 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");