From 3bf72994688ad9292bf37444d80ab5ab1a002748 Mon Sep 17 00:00:00 2001
From: Paweł Sroka <srokap@gmail.com>
Date: Sun, 4 Nov 2012 08:25:28 +0100
Subject: Fixes #1479 - Replaces WP autop with implementation from Steve Clay.

---
 views/default/forms/profile/fields/add.php | 2 +-
 views/default/forms/user/passwordreset.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'views/default/forms')

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',
-- 
cgit v1.2.3


From 3cfc0d3c2b5b4aaaa94179060370e1fe34668464 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 19 Jan 2013 09:36:27 -0500
Subject: Fixes #4982 adds confirm dialog to profile field reset

---
 CHANGES.txt                                       | 14 +++++++++++++-
 languages/en.php                                  |  3 ++-
 views/default/admin/appearance/profile_fields.php | 12 ++++++++++--
 views/default/forms/profile/fields/reset.php      | 12 ------------
 4 files changed, 25 insertions(+), 16 deletions(-)
 delete mode 100644 views/default/forms/profile/fields/reset.php

(limited to 'views/default/forms')

diff --git a/CHANGES.txt b/CHANGES.txt
index acfb7055e..8687b3d2a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,15 @@
+Version 1.8.13
+(January xx, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Cash Costello
+   * Cristo Rabani
+
+  Security Fixes:
+
+  Enhancements:
+	* Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm)
+
+
 Version 1.8.12
 (January 4th, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
   Contributing Developers:
@@ -7,7 +19,6 @@ Version 1.8.12
    * Matt Beckett
    * Paweł Sroka
    * Sem
-   * Srokap
    * Steve Clay
 
   Bugfixes:
@@ -34,6 +45,7 @@ Version 1.8.12
    * Twitter: Login with twitter supports persistent login and correctly forwards
      after login.
 
+
 Version 1.8.11
 (December 5th, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
 
diff --git a/languages/en.php b/languages/en.php
index f3acc50ee..00a825b4d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -405,7 +405,8 @@ $english = array(
 	'profile:editdefault:delete:fail' => 'Removed default profile item field failed',
 	'profile:editdefault:delete:success' => 'Profile field deleted',
 	'profile:defaultprofile:reset' => 'Profile fields reset to the system default',
-	'profile:resetdefault' => 'Reset default profile',
+	'profile:resetdefault' => 'Reset profile fields to system defaults',
+	'profile:resetdefault:confirm' => 'Are you sure you want to delete your custom profile fields?',
 	'profile:explainchangefields' => "You can replace the existing profile fields with your own using the form below. \n\n Give the new profile field a label, for example, 'Favorite team', then select the field type (eg. text, url, tags), and click the 'Add' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label's text to make it editable. \n\n At any time you can revert back to the default profile set up, but you will lose any information already entered into custom fields on profile pages.",
 	'profile:editdefault:success' => 'New profile field added',
 	'profile:editdefault:fail' => 'Default profile could not be saved',
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 91d14b874..f1d78c19f 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -5,12 +5,20 @@
 
 $add = elgg_view_form('profile/fields/add', array('class' => 'elgg-form-settings'), array());
 $list = elgg_view('admin/appearance/profile_fields/list');
-$reset = elgg_view_form('profile/fields/reset', array(), array());
+
+$reset = elgg_view('output/confirmlink', array(
+	'text' => elgg_echo('reset'),
+	'href' => 'action/profile/fields/reset',
+	'title' => elgg_echo('profile:resetdefault'),
+	'confirm' => elgg_echo('profile:resetdefault:confirm'),
+	'class' => 'elgg-button elgg-button-cancel',
+	'is_trusted' => 'true',
+));
 
 $body = <<<__HTML
 $add
 $list
-$reset
+<div class="mtl">$reset</div>
 __HTML;
 
 echo $body;
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
deleted file mode 100644
index c0bb1b7f4..000000000
--- a/views/default/forms/profile/fields/reset.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Reset profile fields form
- */
-
-echo '<div class="elgg-foot">';
-$params = array(
-	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'elgg-button-cancel',
-);
-echo elgg_view('input/submit', $params);
-echo '</div>';
-- 
cgit v1.2.3