From 55ee906ba36cf66c3a390c98dde75e241de26e65 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 7 May 2016 18:05:33 -0400
Subject: Added support for language LDAP attribute

---
 app/Controller/User.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/Controller/User.php')

diff --git a/app/Controller/User.php b/app/Controller/User.php
index f7d7d2e0..4caed1e6 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -67,8 +67,8 @@ class User extends Base
         $is_remote = $this->request->getIntegerParam('remote') == 1 || (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1);
 
         $this->response->html($this->helper->layout->app($is_remote ? 'user/create_remote' : 'user/create_local', array(
-            'timezones' => $this->config->getTimezones(true),
-            'languages' => $this->config->getLanguages(true),
+            'timezones' => $this->timezone->getTimezones(true),
+            'languages' => $this->language->getLanguages(true),
             'roles' => $this->role->getApplicationRoles(),
             'projects' => $this->project->getList(),
             'errors' => $errors,
@@ -121,8 +121,8 @@ class User extends Base
         $user = $this->getUser();
         $this->response->html($this->helper->layout->user('user/show', array(
             'user' => $user,
-            'timezones' => $this->config->getTimezones(true),
-            'languages' => $this->config->getLanguages(true),
+            'timezones' => $this->timezone->getTimezones(true),
+            'languages' => $this->language->getLanguages(true),
         )));
     }
 
@@ -247,7 +247,7 @@ class User extends Base
 
         $this->response->html($this->helper->layout->user('user/integrations', array(
             'user' => $user,
-            'values' => $this->userMetadata->getall($user['id']),
+            'values' => $this->userMetadata->getAll($user['id']),
         )));
     }
 
@@ -365,8 +365,8 @@ class User extends Base
             'values' => $values,
             'errors' => $errors,
             'user' => $user,
-            'timezones' => $this->config->getTimezones(true),
-            'languages' => $this->config->getLanguages(true),
+            'timezones' => $this->timezone->getTimezones(true),
+            'languages' => $this->language->getLanguages(true),
             'roles' => $this->role->getApplicationRoles(),
         )));
     }
-- 
cgit v1.2.3