diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-25 10:01:43 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-25 10:01:43 +0100 |
| commit | adf532fe4e45c529fd0f4a3605cc3e13762642a9 (patch) | |
| tree | b107ba28396f9eb0d250f5ffb03cfbf899c1fdc2 /lib | |
| parent | 44043cb1d715a19ec95a4987827c3201aa1fb13f (diff) | |
| parent | 7b54bf26ea067af53c5fe611ce989908d9b90e31 (diff) | |
| download | nextcloud-server-adf532fe4e45c529fd0f4a3605cc3e13762642a9.tar.gz nextcloud-server-adf532fe4e45c529fd0f4a3605cc3e13762642a9.zip | |
Merge pull request #21806 from owncloud/mdusher-master
[jenkins] Added ' to characters allowed in the username
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/user/manager.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index b547f981616..86750dcd994 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -256,10 +256,10 @@ class Manager extends PublicEmitter implements IUserManager { public function createUser($uid, $password) { $l = \OC::$server->getL10N('lib'); // Check the name for bad characters - // Allowed are: "a-z", "A-Z", "0-9" and "_.@-" - if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) { + // Allowed are: "a-z", "A-Z", "0-9" and "_.@-'" + if (preg_match('/[^a-zA-Z0-9 _\.@\-\']/', $uid)) { throw new \Exception($l->t('Only the following characters are allowed in a username:' - . ' "a-z", "A-Z", "0-9", and "_.@-"')); + . ' "a-z", "A-Z", "0-9", and "_.@-\'"')); } // No empty username if (trim($uid) == '') { |