Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 11:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into blocked-server

Browse source
This commit is contained in:
Michael 2023-01-17 19:25:09 +00:00
commit 259fe7fcf2
30 changed files with 530 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Admin/Addons/Details.php
View file

@ -102,7 +102,7 @@ class Details extends BaseAdmin
if (array_key_exists($addon, $addons_admin)) {
require_once "addon/$addon/$addon.php";
$func = $addon . '_addon_admin';
$func($a, $admin_form);
$func($admin_form);
}
$t = Renderer::getMarkupTemplate('admin/addons/details.tpl');

2
src/Module/Admin/Summary.php
View file

@ -25,14 +25,12 @@ use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Core\Config\ValueObject\Cache;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Update;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Core\Config\Factory\Config;
use Friendica\Model\Register;
use Friendica\Module\BaseAdmin;
use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPException\ServiceUnavailableException;