GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[MEDIA] Rename File to Attachment

Browse Source
This commit is contained in:
Hugo Sales
2021-04-15 22:28:28 +00:00
parent dc5bdfa1fb
commit 5579f4fa5d
6 changed files with 67 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Controller/UserPanel.php
View File

@@ -41,7 +41,6 @@ use App\Core\Form;
use function App\Core\I18n\_m;
use App\Core\Log;
use App\Entity\Avatar;
use App\Entity\File;
use App\Util\ClientException;
use App\Util\Common;
use App\Util\Form\ArrayTransformer;
@@ -147,7 +146,7 @@ class UserPanel extends AbstractController
}
$user = Common::user();
$actor_id = $user->getId();
$file = Media::validateAndStoreFile($sfile, Common::config('avatar', 'dir'), $title = null, $is_local = true, $use_unique = $actor_id);
$file = Media::validateAndStoreAttachment($sfile, Common::config('avatar', 'dir'), $title = null, $is_local = true, $use_unique = $actor_id);
$old_file = null;
$avatar = DB::find('avatar', ['gsactor_id' => $actor_id]);
// Must get old id before inserting another one