diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-22 23:34:19 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-22 23:34:19 +0100 |
| commit | 254a1fa12a4d2f1be95f2edc84f209b92e9d91d2 (patch) | |
| tree | 4bb2d97bc594a447228b6d1d47cdb19702d7afa3 /lib/private/util.php | |
| parent | 5776bfec059f4fd32977e9ddbf97ca4d652dab7a (diff) | |
| parent | 8eda6617618e0a1f650afc4e6766e799b4e62b82 (diff) | |
| download | nextcloud-server-254a1fa12a4d2f1be95f2edc84f209b92e9d91d2.tar.gz nextcloud-server-254a1fa12a4d2f1be95f2edc84f209b92e9d91d2.zip | |
Merge pull request #13314 from owncloud/login-hook-logout
Return false if the login is canceled in a hook
Diffstat (limited to 'lib/private/util.php')
| -rw-r--r-- | lib/private/util.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 3b943f046bf..e2b7eed1ba5 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -782,12 +782,14 @@ class OC_Util { /** * @param array $errors + * @param string[] $messages */ - public static function displayLoginPage($errors = array()) { + public static function displayLoginPage($errors = array(), $messages = []) { $parameters = array(); foreach ($errors as $value) { $parameters[$value] = true; } + $parameters['messages'] = $messages; if (!empty($_REQUEST['user'])) { $parameters["username"] = $_REQUEST['user']; $parameters['user_autofocus'] = false; |