Merge pull request #1 from fguillot/master

3 files changed, 4 insertions, 3 deletions

diff --git a/app/Api/Me.php b/app/Api/Me.php
index ccc809ed..3d08626a 100644
--- a/app/Api/Me.php
+++ b/app/Api/Me.php
@@ -33,7 +33,7 @@ class Me extends Base
     public function getMyActivityStream()
     {
         $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
-        return $this->projectActivity->getProjects($project_ids, 100);
+        return $this->helper->projectActivity->getProjectsEvents($project_ids, 100);
     }
 
     public function createMyPrivateProject($name, $description = null)
diff --git a/app/Api/Project.php b/app/Api/Project.php
index 8e311f7f..846d7046 100644
--- a/app/Api/Project.php
+++ b/app/Api/Project.php
@@ -53,13 +53,13 @@ class Project extends Base
 
     public function getProjectActivities(array $project_ids)
     {
-        return $this->projectActivity->getProjects($project_ids);
+        return $this->helper->projectActivity->getProjectsEvents($project_ids);
     }
 
     public function getProjectActivity($project_id)
     {
         $this->checkProjectPermission($project_id);
-        return $this->projectActivity->getProject($project_id);
+        return $this->helper->projectActivity->getProjectEvents($project_id);
     }
 
     public function createProject($name, $description = null)
diff --git a/app/Api/User.php b/app/Api/User.php
index 9b8081d6..6ee935a3 100644
--- a/app/Api/User.php
+++ b/app/Api/User.php
@@ -87,6 +87,7 @@ class User extends \Kanboard\Core\Base
         try {
 
             $ldap = LdapClient::connect();
+            $ldap->setLogger($this->logger);
             $user = LdapUser::getUser($ldap, $username);
 
             if ($user === null) {