Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

2 files changed, 21 insertions, 1 deletions

diff --git a/pages/account/login.php b/pages/account/login.php
new file mode 100644
index 000000000..14f65cc3f
--- /dev/null
+++ b/pages/account/login.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Assembles and outputs a login page.
+ *
+ * This page serves as a fallback for non-JS users who click on the login
+ * drop down link.
+ *
+ * If the user is logged in, this page will forward to the front page.
+ *
+ * @package Elgg.Core
+ * @subpackage Accounts
+ */
+
+if (elgg_is_logged_in()) {
+	forward('');
+}
+
+$login_box = elgg_view('core/account/login_box');
+$content = elgg_view_layout('one_column', array('content' => $login_box));
+echo elgg_view_page(elgg_echo('login'), $content);
diff --git a/pages/account/register.php b/pages/account/register.php
index 5eb2b4001..cf18a635b 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -37,7 +37,7 @@ if (elgg_get_config('https_login')) {
 }
 $form_params = array(
 	'action' => $register_url,
-	'class' => 'elgg-form-account float',
+	'class' => 'elgg-form-account',
 );
 
 $body_params = array(