chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2459 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2020-11-27 14:22:39 -07:00 committed by GitHub
parent 72cff7ed12 9d1499eeb9
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') { if($user->is_admin || $user->status == 'deleted') {
continue; continue;
} }
if(in_array($user->username, $restricted)) { if(in_array(strtolower($user->username), array_map('strtolower', $restricted))) {
$affected->push($user); $affected->push($user);
} }
$val = str_replace(['-', '_', '.'], '', $user->username); $val = str_replace(['-', '_', '.'], '', $user->username);

5
app/Place.php
View File

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