Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 11 insertions, 0 deletions

diff --git a/views/default/core/walled_garden/body.php b/views/default/core/walled_garden/body.php
new file mode 100644
index 000000000..67d8e0c37
--- /dev/null
+++ b/views/default/core/walled_garden/body.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Walled garden body
+ */
+
+echo elgg_view('core/walled_garden/login');
+echo elgg_view('core/walled_garden/lost_password');
+
+if (elgg_get_config('allow_registration')) {
+	echo elgg_view('core/walled_garden/register');
+}