From: Sem <sembrestels@riseup.net>
Date: Fri, 23 Aug 2013 03:38:47 +0000 (-0400)
Subject: Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f24e08416c793428ba863840e7d5e502e6d68cfc;p=lorea%2Felgg.git

Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8

Conflicts:
	views/default/page/elements/foot.php
	views/default/page/elements/owner_block.php
---

f24e08416c793428ba863840e7d5e502e6d68cfc
diff --cc views/default/page/walled_garden.php
index 1075ea811,26d1235c2..c12a7203d
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@@ -3,10 -3,14 +3,16 @@@
   * Walled garden page shell
   *
   * Used for the walled garden index page
 + * 
 + * @override views/default/page/walled_garden.php
   */
  
+ $is_sticky_register = elgg_is_sticky_form('register');
+ $wg_body_class = 'elgg-body-walledgarden';
+ if ($is_sticky_register) {
+ 	$wg_body_class .= ' hidden';
+ }
+ 
  // Set the content type
  header("Content-type: text/html; charset=UTF-8");
  ?>