diff options
| author | Nick Bakkegaard <nickbakkegaard@gmail.com> | 2017-08-01 06:05:52 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-08-04 14:24:39 +0300 |
| commit | f711e7d214ab7e171f7fddc3549e678f63ea69cd (patch) | |
| tree | a42191a161ac4d158eb252f74e98fc894b863930 | |
| parent | 5394c70fb9d577e412be8ffe8591d2c221023b91 (diff) | |
fix personal settingspr/40
| -rw-r--r-- | controller/settingscontroller.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 1743b8f..01229b5 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -55,8 +55,10 @@ class SettingsController extends Controller { // Private API call $navigation = $this->navigationManager->getAll(); $order = json_decode($this->appConfig->getAppValue('order')); + if($order === null) $order = array(); $nav = $this->util->matchOrder($navigation, $order); $hidden = json_decode($this->appConfig->getAppValue('hidden')); + if($hidden === null) $hidden = array(); return new TemplateResponse( $this->appName, 'admin', @@ -69,8 +71,16 @@ class SettingsController extends Controller { // Private API call $navigation = $this->navigationManager->getAll(); $order = json_decode($this->appConfig->getUserValue('order', $this->userId)); + if($order === null){ + $order = json_decode($this->appConfig->getAppValue('order')); + if($order === null) $order = array(); + } $nav = $this->util->matchOrder($navigation, $order); $hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId)); + if($hidden === null){ + $hidden = json_decode($this->appConfig->getAppValue('hidden')); + if($hidden === null) $hidden = array(); + } return new TemplateResponse( $this->appName, 'admin', |