Merge branch 'lostpassword'

Conflicts:
	core/templates/login.php
	index.php
	lib/util.php

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/util.php b/lib/util.php
index 26d718da944..f21ec8208b4 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -258,6 +258,14 @@ class OC_Util {
 		return $errors;
 	}
 
+	public static function displayLoginPage($parameters = array()){
+		if(isset($_COOKIE["username"])){
+			$parameters["username"] = $_COOKIE["username"];
+		} else {
+			$parameters["username"] = '';
+		}
+		OC_Template::printGuestPage("", "login", $parameters);
+	}
 
 	/**
 	* Try to get the username the httpd server runs on, used in hints