From 0a66f48aa1293f93579b7de9bc5d080cf5f3105e Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Thu, 5 Jun 2014 14:47:38 +0200 Subject: Do not return "None" in user functions Return null instead of the string "None" in username_from_id(), uid_from_email() and uid_from_username(). Signed-off-by: Lukas Fleischer --- web/html/passreset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/html/passreset.php') diff --git a/web/html/passreset.php b/web/html/passreset.php index 9541021..9d8e1ae 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -25,7 +25,7 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir $error = __('Missing a required field.'); } elseif ($password != $confirm) { $error = __('Password fields do not match.'); - } elseif ($uid == NULL || $uid == 'None') { + } elseif ($uid == null) { $error = __('Invalid e-mail.'); } -- cgit v1.2.3-54-g00ecf