Merge remote-tracking branch 'origin/master'

Export/Aggregator/ActivityTypeAggregator.php

@@ -63,32 +63,6 @@ class ActivityTypeAggregator implements AggregatorInterface
         // add select element    
         $qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));
         
-        // make a jointure only if needed
-        /*$join = $qb->getDQLPart('join');
-        if (
-            (array_key_exists('activity', $join)
-            &&
-            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
-            )
-            OR
-            (! array_key_exists('activity', $join))
-        ) {
-            $qb->add(
-                    'join', 
-                    array('activity' => 
-                        new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')
-                        ), 
-                    true);
-        }
-        
-        // join category if necessary
-        if ($alias === 'activity_categories_id') {
-            // add join only if needed
-            if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
-                $qb->join('reasons.category', 'category');
-            }
-        }*/
-        
         // add the "group by" part
         $groupBy = $qb->addGroupBy(self::KEY);
     }