mirror of
https://github.com/Karaka-Management/oms-Media.git
synced 2026-02-17 09:48:41 +00:00
Merge branch 'develop' of https://github.com/Karaka-Management/oms-Media into develop
This commit is contained in:
commit
9c22a8b84b
|
|
@ -165,7 +165,7 @@ class UploadFile
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($this->allowedTypes) && !in_array($f['type'], $this->allowedTypes, true)) {
|
if (!empty($this->allowedTypes) && !\in_array($f['type'], $this->allowedTypes, true)) {
|
||||||
$result[$key]['status'] = UploadStatus::WRONG_EXTENSION;
|
$result[$key]['status'] = UploadStatus::WRONG_EXTENSION;
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
|
||||||
$account = new Account();
|
$account = new Account();
|
||||||
TestUtils::setMember($account, 'id', 1);
|
TestUtils::setMember($account, 'id', 1);
|
||||||
|
|
||||||
$permission = new AccountPermission();
|
$permission = new AccountPermission();
|
||||||
$permission->unit = 1;
|
$permission->unit = 1;
|
||||||
$permission->app = 1;
|
$permission->app = 1;
|
||||||
$permission->setPermission(
|
$permission->setPermission(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user