Possibly Avoid database error when storing photo item

[friendica.git] / src / Module / BaseApi.php

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 009809376e189bfb9ac232adf30c94af68dab090..c67671954fd8979fb057042433090cf7b82c4c55 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -67,6 +67,8 @@ class BaseApi extends BaseModule
        public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $this->app = $app;
        }
 
        protected function delete()
@@ -108,12 +110,16 @@ class BaseApi extends BaseModule
        /**
         * Processes data from GET requests and sets defaults
         *
+        * @param array      $defaults Associative array of expected request keys and their default typed value. A null
+        *                             value will remove the request key from the resulting value array.
+        * @param array|null $request  Custom REQUEST array, superglobal instead
         * @return array request data
+        * @throws \Exception
         */
-       public static function getRequest(array $defaults)
+       public static function getRequest(array $defaults, array $request = null): array
        {
                $httpinput = HTTPInputData::process();
-               $input = array_merge($httpinput['variables'], $httpinput['files'], $_REQUEST);
+               $input = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
 
                self::$request    = $input;
                self::$boundaries = [];