Merge branch 'FreshRSS/dev' into cli_update_user

This commit is contained in:
Alexandre Alapetite
2017-07-27 09:40:53 +02:00
5 changed files with 9 additions and 6 deletions

View File

@@ -18,7 +18,7 @@ if (empty($options['user'])) {
}
$username = $options['user'];
if (!FreshRSS_user_Controller::checkUsername($username)) {
fail('FreshRSS error: invalid username “' . $username . '”');
fail('FreshRSS error: invalid username “' . $username . '”! Must be matching ' . FreshRSS_user_Controller::USERNAME_PATTERN);
}
$usernames = listUsers();