UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2459 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2020-11-27 14:22:39 -07:00 committed by GitHub
commit c6f69b99d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/FixUsernames.php
View file

@ -57,7 +57,7 @@ class FixUsernames extends Command
if($user->is_admin || $user->status == 'deleted') {
continue;
}
if(in_array($user->username, $restricted)) {
if(in_array(strtolower($user->username), array_map('strtolower', $restricted))) {
$affected->push($user);
}
$val = str_replace(['-', '_', '.'], '', $user->username);

5
app/Place.php
View file

@ -40,4 +40,9 @@ class Place extends Model
{
return $this->url();
}
public function getName()
{
return $this->name . ', ' . $this->country;
}
}