diff --git a/appinfo/info.xml b/appinfo/info.xml index 8f545ea862ef75c74f6b0b84fa35288e76584432..7f50ed31a05ba76a7330a09e1e6c3e10d27120ea 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Murena Dashboard Murena Dashboard - 2.0.2 + 2.0.3 agpl Murena MurenaDashboard diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index ef909ac1627e9bd39ef8baa0218491257fed6f9e..6d40f46a48c1df960388e104e2c7178794674da0 100755 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -22,12 +22,14 @@ class PageController extends Controller { private AppsService $appsService; + private string $appName; public function __construct($appName, IRequest $request, IInitialState $initialState, IConfig $config, IUserSession $userSession, AppsService $appsService) { $this->initialState = $initialState; $this->config = $config; $this->userSession = $userSession; $this->appsService = $appsService; + $this->appName = $appName; parent::__construct($appName, $request); } diff --git a/lib/Service/AppsService.php b/lib/Service/AppsService.php index 84f511f070c48f7b97a256d5d23f83ef0f1b866c..f17549f812bad73cbce8f5027b1d22f5d892a1f4 100644 --- a/lib/Service/AppsService.php +++ b/lib/Service/AppsService.php @@ -75,7 +75,7 @@ class AppsService { } public function getAppOrder() { - $order_raw = $this->config->getUserValue($this->userId, $this->appName, 'order'); + $order_raw = $this->config->getUserValue($this->userId, 'murena_launcher', 'order'); // If order raw empty try to get from 'apporder' app config $order_raw = !$order_raw ? $this->config->getUserValue($this->userId, 'apporder', 'order') : $order_raw; // If order raw is still empty, return empty array