Merge branch 'stable'

# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/permission/BanEntry.php
#	src/permission/PermissionAttachmentInfo.php
This commit is contained in:
Dylan K. Taylor
2020-12-01 17:35:30 +00:00
5 changed files with 42 additions and 38 deletions

View File

@@ -159,7 +159,11 @@ class PluginDescription{
$this->authors = [];
if(isset($plugin["author"])){
$this->authors[] = $plugin["author"];
if(is_array($plugin["author"])){
$this->authors = $plugin["author"];
}else{
$this->authors[] = $plugin["author"];
}
}
if(isset($plugin["authors"])){
foreach($plugin["authors"] as $author){