[Dolibarr-git] [Dolibarr/dolibarr] 453ed8: FIX error in SQL due to a previous fix

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 453ed8a05e757cfc38d308abe8d8c9da526738a1
      
https://github.com/Dolibarr/dolibarr/commit/453ed8a05e757cfc38d308abe8d8c9da526738a1
  Author: Alexis ALGOUD <address@hidden>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M htdocs/core/lib/security.lib.php

  Log Message:
  -----------
  FIX error in SQL due to a previous fix


  Commit: 34adc60d267a39c596eef3dffdb3a91723ab3dd3
      
https://github.com/Dolibarr/dolibarr/commit/34adc60d267a39c596eef3dffdb3a91723ab3dd3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M htdocs/core/lib/security.lib.php

  Log Message:
  -----------
  Merge pull request #3618 from 
atm-alexis/fix_event_for_user_restricted_if_no_company

FIX error in SQL due to a previous fix


Compare: 
https://github.com/Dolibarr/dolibarr/compare/86b1a9cbcee8...34adc60d267a