diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2012-12-06 14:02:18 -0500 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2012-12-06 14:02:18 -0500 |
| commit | a60a58a6e884af4ab89b118bf2f23132335381fe (patch) | |
| tree | 3e27ff18d2a6c476b526cc214263c51186ca75ad /views/default/forms | |
| parent | 6676577386c72d4a024c5c61a948589db8aaf9c7 (diff) | |
| parent | 3bf72994688ad9292bf37444d80ab5ab1a002748 (diff) | |
| download | elgg-a60a58a6e884af4ab89b118bf2f23132335381fe.tar.gz elgg-a60a58a6e884af4ab89b118bf2f23132335381fe.tar.bz2 | |
Merge branch 'pr-420' into 1.8
Diffstat (limited to 'views/default/forms')
| -rw-r--r-- | views/default/forms/profile/fields/add.php | 2 | ||||
| -rw-r--r-- | views/default/forms/user/passwordreset.php | 2 |
2 files changed, 2 insertions, 2 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', |