diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-04-27 20:32:42 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-04-27 20:32:42 +0200 |
| commit | 53f00571e554f6eeea4fea19d9ddc5eca2ce2997 (patch) | |
| tree | e08b718816125809d8514d87745a80bedc6def44 | |
| parent | ed99245810fce469b30c946e7fc405887c2a5b61 (diff) | |
| parent | 1e5b151d88cfe25391a1daf77da99b81cf6f8414 (diff) | |
Merge pull request #1512 from Alkarex/edge-login
Work around for IE / Edge pattern bug
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/Controllers/userController.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb5155d3..13b980e9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ * Do not require PHP extension `fileinfo` for favicons [#1461](https://github.com/FreshRSS/FreshRSS/issues/1461) * Fix UI lowest subscription popup hidden [#1479](https://github.com/FreshRSS/FreshRSS/issues/1479) * Fix update system via ZIP archive [#1498](https://github.com/FreshRSS/FreshRSS/pull/1498) + * Work around for IE / Edge bug in username pattern in version 1.6.3 [#1511](https://github.com/FreshRSS/FreshRSS/issues/1511) * I18n * Improve English [#1465](https://github.com/FreshRSS/FreshRSS/pull/1465) * Misc. diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index ed30eb69f..3cbbd8633 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -38,7 +38,7 @@ class FreshRSS_user_Controller extends Minz_ActionController { * The username is also used as folder name, file name, and part of SQL table name. * '_' is a reserved internal username. */ - const USERNAME_PATTERN = '[0-9a-zA-Z]|[0-9a-zA-Z_]{2,38}'; + const USERNAME_PATTERN = '[0-9a-zA-Z_]{2,38}|[0-9a-zA-Z]'; public static function checkUsername($username) { return preg_match('/^' . self::USERNAME_PATTERN . '$/', $username) === 1; |