diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/Controller/BaseController.php | 2 | ||||
-rw-r--r-- | app/Controller/FileViewerController.php | 2 | ||||
-rw-r--r-- | app/User/LdapUserProvider.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/Controller/BaseController.php b/app/Controller/BaseController.php index 36871bb4..5f6976ad 100644 --- a/app/Controller/BaseController.php +++ b/app/Controller/BaseController.php @@ -77,7 +77,7 @@ abstract class BaseController extends Base $model = 'projectFile'; if ($task_id > 0) { - $model = 'taskFile'; + $model = 'taskFileModel'; $project_id = $this->taskFinderModel->getProjectId($task_id); if ($project_id !== $this->request->getIntegerParam('project_id')) { diff --git a/app/Controller/FileViewerController.php b/app/Controller/FileViewerController.php index 245845c7..518f5b0b 100644 --- a/app/Controller/FileViewerController.php +++ b/app/Controller/FileViewerController.php @@ -45,7 +45,7 @@ class FileViewerController extends BaseController $type = $this->helper->file->getPreviewType($file['name']); $params = array('file_id' => $file['id'], 'project_id' => $this->request->getIntegerParam('project_id')); - if ($file['model'] === 'taskFile') { + if ($file['model'] === 'taskFileModel') { $params['task_id'] = $file['task_id']; } diff --git a/app/User/LdapUserProvider.php b/app/User/LdapUserProvider.php index 274d7665..8ea89763 100644 --- a/app/User/LdapUserProvider.php +++ b/app/User/LdapUserProvider.php @@ -88,6 +88,7 @@ class LdapUserProvider implements UserProviderInterface * @param string $role * @param string[] $groupIds * @param string $photo + * @param string $language */ public function __construct($dn, $username, $name, $email, $role, array $groupIds, $photo = '', $language = '') { |