aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/js/walled_garden.php12
-rw-r--r--views/default/page/walled_garden.php2
2 files changed, 2 insertions, 12 deletions
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
index 09a478e93..e228df507 100644
--- a/views/default/js/walled_garden.php
+++ b/views/default/js/walled_garden.php
@@ -5,7 +5,6 @@
* @since 1.8
*/
-// note that this assumes the button view is not using single quotes
$cancel_button = elgg_view('input/button', array(
'value' => elgg_echo('cancel'),
'class' => 'elgg-button-cancel mlm',
@@ -52,22 +51,13 @@ elgg.walled_garden.load = function(view) {
if (view == 'register' && $wg.hasClass('hidden')) {
// this was a failed register, display the register form ASAP
- $('#elgg-walledgarden-login').toggle();
+ $('#elgg-walledgarden-login').toggle(false);
$(id).toggle();
$wg.removeClass('hidden');
} else {
$('#elgg-walledgarden-login').fadeToggle();
$(id).fadeToggle();
}
-
- if (view == 'register') {
- $('.elgg-form-register').submit(function () {
- // set short cookie indicating JS support
- var date = new Date();
- date.setTime(date.getTime() + (60 * 1000));
- elgg.session.cookie('elgg_js_support', '1', { expires: date });
- });
- }
}
});
event.preventDefault();
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 87a79a690..b280cf6b2 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -7,7 +7,7 @@
$is_sticky_register = elgg_is_sticky_form('register');
$wg_body_class = 'elgg-body-walledgarden';
-if ($is_sticky_register && !empty($_COOKIE['elgg_js_support'])) {
+if ($is_sticky_register) {
$wg_body_class .= ' hidden';
}