Compare commits

..

5 commits

Author SHA1 Message Date
mrilyew
5af2b5d794 Merge branch 'patch_may' of https://github.com/OpenVK/openvk into patch_may 2025-05-03 16:45:23 +03:00
2f4e3c4a78
style: linting fixes 2025-05-03 16:45:00 +03:00
mrilyew
fd7c2baca1 patch 2025-05-03 16:44:57 +03:00
mrilyew
b2e4791d2d
find the sticks put the puzzles 2025-05-03 16:38:32 +03:00
c54ccf6e28
fix(actions): update Ubuntu (#1280)
20.04 is no longer supported by GitHub so using ubuntu-latest instead
2025-05-03 16:37:43 +03:00
4 changed files with 5 additions and 5 deletions

View file

@ -7,7 +7,7 @@ on:
jobs: jobs:
phpstan: phpstan:
name: PHPStan name: PHPStan
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
# 'push' runs on inner branches, 'pull_request' will run only on outer PRs # 'push' runs on inner branches, 'pull_request' will run only on outer PRs
if: > if: >

View file

@ -6,7 +6,7 @@ on:
jobs: jobs:
lint: lint:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
# 'push' runs on inner branches, 'pull_request' will run only on outer PRs # 'push' runs on inner branches, 'pull_request' will run only on outer PRs
if: > if: >

View file

@ -434,7 +434,7 @@ class Audio extends Media
$obj->manifest = $this->getURL(); $obj->manifest = $this->getURL();
$obj->keys = $this->getKeys(); $obj->keys = $this->getKeys();
} }
if ($obj->editable) { if ($obj->editable) {
$obj->listens = $this->getListens(); $obj->listens = $this->getListens();
} }

View file

@ -537,14 +537,14 @@ final class AudioPresenter extends OpenVKPresenter
DatabaseConnection::i()->getContext()->table("playlist_relations")->where([ DatabaseConnection::i()->getContext()->table("playlist_relations")->where([
"collection" => $playlist->getId(), "collection" => $playlist->getId(),
])->delete(); ])->delete();
if (!is_null($new_audios)) { if (!is_null($new_audios)) {
foreach ($new_audios as $new_audio) { foreach ($new_audios as $new_audio) {
$audio = (new Audios())->get((int) $new_audio); $audio = (new Audios())->get((int) $new_audio);
if (!$audio || $audio->isDeleted()) { if (!$audio || $audio->isDeleted()) {
continue; continue;
} }
$playlist->add($audio); $playlist->add($audio);
} }
} }