Merge branch 'projects_on_calendar' into 'master'

fix #2 allow projects to show up on the calendar

the parameters for the query are the wrong way round, the user/group Ids are first in the query before the dates.

See merge request !2

modules/Calendar/actions/Feed.php

@@ -334,7 +334,7 @@ class Calendar_Feed_Action extends Vtiger_BasicAjax_Action {
 		$user = Users_Record_Model::getCurrentUserModel();
 		$userAndGroupIds = array_merge(array($user->getId()),$this->getGroupsIdsForUsers($user->getId()));
         $params = array($start,$end,$start);
-        $params = array_merge($params, $userAndGroupIds);
+        $params = array_merge($userAndGroupIds, $params);
         
 		$query = "SELECT projectname, startdate, targetenddate, crmid FROM vtiger_project";
 		$query.= " INNER JOIN vtiger_crmentity ON vtiger_project.projectid = vtiger_crmentity.crmid";
@@ -392,4 +392,4 @@ class Calendar_Feed_Action extends Vtiger_BasicAjax_Action {
 		}
 	}
 
-}
\ No newline at end of file
+}