diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 10f8264ab..56617d57f 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1878,7 +1878,7 @@ class ApiV1Controller extends Controller $media->original_sha256 = $hash; $media->size = $photo->getSize(); $media->mime = $mime; - $media->caption = $request->input('description'); + $media->caption = $request->input('description') ?? ""; $media->filter_class = $filterClass; $media->filter_name = $filterName; if ($license) { @@ -2106,7 +2106,7 @@ class ApiV1Controller extends Controller $media->original_sha256 = $hash; $media->size = $photo->getSize(); $media->mime = $mime; - $media->caption = $request->input('description'); + $media->caption = $request->input('description') ?? ""; $media->filter_class = $filterClass; $media->filter_name = $filterName; if ($license) { diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php index cfd44969b..480b9c8e4 100644 --- a/app/Http/Controllers/ComposeController.php +++ b/app/Http/Controllers/ComposeController.php @@ -119,10 +119,11 @@ class ComposeController extends Controller $media->media_path = $path; $media->original_sha256 = $hash; $media->size = $photo->getSize(); + $media->caption = ""; $media->mime = $mime; $media->filter_class = $filterClass; $media->filter_name = $filterName; - $media->version = 3; + $media->version = '3'; $media->save(); $preview_url = $media->url().'?v='.time(); diff --git a/config/database.php b/config/database.php index 38a197dac..92d6a2ba2 100644 --- a/config/database.php +++ b/config/database.php @@ -60,6 +60,26 @@ return [ ] ], + 'mariadb' => [ + 'driver' => 'mariadb', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => env('DB_CHARSET', 'utf8mb4'), + 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'), + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + 'pgsql' => [ 'driver' => 'pgsql', 'host' => env('DB_HOST', '127.0.0.1'),