aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorPaweł Sroka <srokap@gmail.com>2012-11-04 08:25:28 +0100
committerPaweł Sroka <srokap@gmail.com>2012-11-04 08:25:28 +0100
commit3bf72994688ad9292bf37444d80ab5ab1a002748 (patch)
tree2fcdd2f2773e3bf4cc0af9e8133918133a6f6760 /views/default
parentb2232139f13b759e8f5ce62def75eaeaa530a5b6 (diff)
downloadelgg-3bf72994688ad9292bf37444d80ab5ab1a002748.tar.gz
elgg-3bf72994688ad9292bf37444d80ab5ab1a002748.tar.bz2
Fixes #1479 - Replaces WP autop with implementation from Steve Clay.
Diffstat (limited to 'views/default')
-rw-r--r--views/default/forms/profile/fields/add.php2
-rw-r--r--views/default/forms/user/passwordreset.php2
-rw-r--r--views/default/output/longtext.php2
-rw-r--r--views/default/page/elements/messages.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index 1ea9c57a9..2087ec299 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -25,5 +25,5 @@ $formbody = <<< END
$submit_control</div>
END;
-echo autop(elgg_echo('profile:explainchangefields'));
+echo elgg_autop(elgg_echo('profile:explainchangefields'));
echo $formbody;
diff --git a/views/default/forms/user/passwordreset.php b/views/default/forms/user/passwordreset.php
index 3c89776f6..5946fa7c0 100644
--- a/views/default/forms/user/passwordreset.php
+++ b/views/default/forms/user/passwordreset.php
@@ -3,7 +3,7 @@
* Reset user password form
*/
-echo autop(elgg_echo('user:resetpassword:reset_password_confirm'));
+echo elgg_autop(elgg_echo('user:resetpassword:reset_password_confirm'));
echo elgg_view('input/hidden', array(
'name' => 'u',
diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php
index 200f27de5..589100c4f 100644
--- a/views/default/output/longtext.php
+++ b/views/default/output/longtext.php
@@ -31,7 +31,7 @@ if ($parse_urls) {
$text = filter_tags($text);
-$text = autop($text);
+$text = elgg_autop($text);
$attributes = elgg_format_attributes($vars);
diff --git a/views/default/page/elements/messages.php b/views/default/page/elements/messages.php
index a35a48586..edd40d71e 100644
--- a/views/default/page/elements/messages.php
+++ b/views/default/page/elements/messages.php
@@ -18,7 +18,7 @@ if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object'
foreach ($vars['object'] as $type => $list ) {
foreach ($list as $message) {
echo "<li class=\"elgg-message elgg-state-$type\">";
- echo autop($message);
+ echo elgg_autop($message);
echo '</li>';
}
}