Merge pull request #13724 from Raroun/Fix-for-Issue-#13637---Photo-caption-prevents...

[friendica.git] / src / Module / Settings / UserExport.php

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 85e1f75c65be4cf86e5987731be5eedb6344d46f..7ff08d97b7f476faeaadc1f69ddf504c1c80eca2 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -47,17 +47,13 @@ use Psr\Log\LoggerInterface;
  **/
 class UserExport extends BaseSettings
 {
-       /** @var IHandleUserSessions */
-       private $session;
-
        /** @var DbaDefinition */
        private $dbaDefinition;
 
-       public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->session       = $session;
                $this->dbaDefinition = $dbaDefinition;
        }
 
@@ -267,12 +263,12 @@ class UserExport extends BaseSettings
                        sprintf("SELECT * FROM `pconfig` WHERE uid = %d", $user_id)
                );
 
-               $group = $this->exportMultiRow(
+               $circle = $this->exportMultiRow(
                        sprintf("SELECT * FROM `group` WHERE uid = %d", $user_id)
                );
 
-               $group_member = $this->exportMultiRow(
-                       sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", $user_id)
+               $circle_member = $this->exportMultiRow(
+                       sprintf("SELECT `circle_member`.`gid`, `circle_member`.`contact-id` FROM `group_member` AS `circle_member` INNER JOIN `group` AS `circle` ON `circle`.`id` = `circle_member`.`gid` WHERE `circle`.`uid` = %d", $user_id)
                );
 
                $output = [
@@ -285,8 +281,8 @@ class UserExport extends BaseSettings
                        'profile_fields' => $profile_fields,
                        'photo' => $photo,
                        'pconfig' => $pconfig,
-                       'group' => $group,
-                       'group_member' => $group_member,
+                       'circle' => $circle,
+                       'circle_member' => $circle_member,
                ];
 
                echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);