aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Sroka <srokap@gmail.com>2013-06-07 04:04:34 +0200
committerPaweł Sroka <srokap@gmail.com>2013-06-07 04:04:34 +0200
commit6c06ce537e6fe891b886a1b64359618704129002 (patch)
tree4dfde27b1edcdb49bdbe1095b5e634e030408c76
parent8dbdf2f72c9dccbbd471e805fbd112c6817cdcec (diff)
downloadelgg-6c06ce537e6fe891b886a1b64359618704129002.tar.gz
elgg-6c06ce537e6fe891b886a1b64359618704129002.tar.bz2
Fixes #5594 - Failed registration automatically reopens register form on walled garden login page
-rw-r--r--views/default/core/walled_garden/login.php10
-rw-r--r--views/default/js/walled_garden.php1
2 files changed, 11 insertions, 0 deletions
diff --git a/views/default/core/walled_garden/login.php b/views/default/core/walled_garden/login.php
index 42b79607d..db9ce3310 100644
--- a/views/default/core/walled_garden/login.php
+++ b/views/default/core/walled_garden/login.php
@@ -29,3 +29,13 @@ echo <<<HTML
</div>
</div>
HTML;
+
+if (elgg_is_sticky_form('register')) {
+?>
+<script type="text/javascript">
+ elgg.register_hook_handler('init', 'system', function(){
+ elgg.walled_garden.load('register')($.Event("click"));
+ });
+</script>
+<?php
+}
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
index 7a482fe23..b15cf880a 100644
--- a/views/default/js/walled_garden.php
+++ b/views/default/js/walled_garden.php
@@ -42,6 +42,7 @@ elgg.walled_garden.load = function(view) {
return function(event) {
var id = '#elgg-walledgarden-' + view;
id = id.replace('_', '-');
+ //@todo display some visual element that indicates that loading of content is running
elgg.get('walled_garden/' + view, {
'success' : function(data) {
$('.elgg-body-walledgarden').append(data);