зеркало из https://github.com/nextcloud/server.git
Remove brackets for invalid mail addresses when updating the license header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Родитель
44f9779f9f
Коммит
7006b739b0
|
@ -322,6 +322,7 @@ With help from many libraries and frameworks including:
|
|||
}
|
||||
|
||||
$authors = array_map(function($author){
|
||||
$author = $this->fixInvalidEmail($author);
|
||||
$this->authors[$author] = $author;
|
||||
return " * @author $author";
|
||||
}, $authors);
|
||||
|
@ -348,6 +349,14 @@ With help from many libraries and frameworks including:
|
|||
}
|
||||
return $author;
|
||||
}
|
||||
|
||||
private function fixInvalidEmail($author) {
|
||||
preg_match('/<(.*)>/', $author, $mailMatch);
|
||||
if (count($mailMatch) === 2 && !filter_var($mailMatch[1], FILTER_VALIDATE_EMAIL)) {
|
||||
$author = str_replace('<'.$mailMatch[1].'>', '"'.$mailMatch[1].'"', $author);
|
||||
}
|
||||
return $author;
|
||||
}
|
||||
}
|
||||
|
||||
$licenses = new Licenses;
|
||||
|
|
Загрузка…
Ссылка в новой задаче