[Dolibarr-git] [Dolibarr/dolibarr] 38ccf7: Fix : Agenda getCalendarEvents hook

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 38ccf7ffdd74ae5d36f3a3ff20702a97f8c79119
      
https://github.com/Dolibarr/dolibarr/commit/38ccf7ffdd74ae5d36f3a3ff20702a97f8c79119
  Author: hugome <address@hidden>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M htdocs/comm/action/index.php

  Log Message:
  -----------
  Fix : Agenda getCalendarEvents hook

Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.


  Commit: b97059631037a522d7285897ee84216d81e4b0fe
      
https://github.com/Dolibarr/dolibarr/commit/b97059631037a522d7285897ee84216d81e4b0fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M htdocs/comm/action/index.php

  Log Message:
  -----------
  Merge pull request #6481 from Hugome/fix-agenda-merge

FIX : Agenda getCalendarEvents hook


Compare: 
https://github.com/Dolibarr/dolibarr/compare/290caba16070...b97059631037