aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-05-18 01:58:37 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-05-18 01:58:37 +0000
commit52ad7afda5a1f4001155227d2d96ddf04f8a28d1 (patch)
tree8f6448ae0cb7998feeb3f498ee19489425efebd2
parent3468b554c90457e0033564ccd209359a4a37abd3 (diff)
downloadelgg-52ad7afda5a1f4001155227d2d96ddf04f8a28d1.tar.gz
elgg-52ad7afda5a1f4001155227d2d96ddf04f8a28d1.tar.bz2
Fixes #3385 rel now used for the confirm text so that title can be used separately
git-svn-id: http://code.elgg.org/elgg/trunk@9099 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--js/lib/ui.js2
-rw-r--r--views/default/output/confirmlink.php4
-rw-r--r--views/default/page/elements/header.php6
3 files changed, 6 insertions, 6 deletions
diff --git a/js/lib/ui.js b/js/lib/ui.js
index 85ca8caf1..692311d73 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -221,7 +221,7 @@ elgg.ui.initHoverMenu = function(parent) {
* @return void
*/
elgg.ui.requiresConfirmation = function(e) {
- var confirmText = $(this).attr('title') || elgg.echo('question:areyousure');
+ var confirmText = $(this).attr('rel') || elgg.echo('question:areyousure');
if (!confirm(confirmText)) {
e.preventDefault();
}
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 967094113..5059a656e 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -13,7 +13,8 @@
* @uses $vars['text_encode'] Encode special characters? (false)
*/
-$confirm = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = addslashes($vars['rel']);
$encode = elgg_extract('text_encode', $vars, false);
// always generate missing action tokens
@@ -36,7 +37,6 @@ if (isset($vars['class'])) {
} else {
$vars['class'] = 'elgg-requires-confirmation';
}
-//$vars['onclick'] = "return confirm('" . addslashes($confirm) . "')";
unset($vars['encode_text']);
unset($vars['text']);
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 2361644f2..1a1f5d211 100644
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -1,8 +1,8 @@
<?php
/**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
+ * Elgg page header
+ * In the default theme, the header lives between the topbar and main content area.
+ */
// link back to main site.
echo elgg_view('page/elements/header_logo', $vars);