eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[PLUGINS][ProfileColor] Settings page render problem fixed. ColorType given data wasn't a string.

Browse Source
This commit is contained in:
Eliseu Amaro
2021-09-25 12:51:25 +01:00
parent 57b94af9f6
commit 808da203ad
7 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/ProfileColor/ProfileColor.php
View File

@@ -25,6 +25,8 @@ use App\Core\Event;
use App\Core\Modules\Plugin;
use App\Core\Router\RouteLoader;
use App\Util\Common;
use App\Util\Exception\RedirectException;
use App\Util\Exception\ServerException;
use App\Util\Formatting;
use Plugin\ProfileColor\Controller as C;
use Symfony\Component\HttpFoundation\Request;
@@ -50,10 +52,17 @@ class ProfileColor extends Plugin
*/
public function onAddRoute(RouteLoader $r): bool
{
$r->connect('settings_profile_color', 'settings/color', [Controller\ProfileColor::class, 'profilecolorsettings']);
$r->connect('settings_profile_color', 'settings/color', [Controller\ProfileColor::class, 'profileColorSettings']);
return Event::next;
}
/**
* @param Request $request
* @param $tabs
* @return bool
* @throws RedirectException
* @throws ServerException
*/
public function onPopulateProfileSettingsTabs(Request $request, &$tabs)
{
// TODO avatar template shouldn't be on settings folder
@@ -74,15 +83,15 @@ class ProfileColor extends Plugin
* @param $res
* @return bool
*/
public function onAppendCardProfile(&$res): bool
public function onAppendCardProfile($vars, &$res): bool
{
$user = Common::user();
if ($user !== null) {
$actor_id = $user->getId();
$actor = $vars['actor'];
if ($actor !== null) {
$actor_id = $actor->getId();
$color = DB::find('profile_color', ['actor_id' => $actor_id]);
if ($color !== null) {
$res[] = Formatting::twigRenderFile('/profileColor/profileColorView.html.twig', ['profile' => $color]);
$res[] = Formatting::twigRenderFile('/profileColor/profileColorView.html.twig', ['profile_color' => $color, 'actor' => $actor_id]);
}
}