[Dolibarr-git] [Dolibarr/dolibarr] ffbe2a: Fix: use https if https is used

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ffbe2acc36d6b148b9e51902f2dea4cfd8864176
      
https://github.com/Dolibarr/dolibarr/commit/ffbe2acc36d6b148b9e51902f2dea4cfd8864176
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Fix: use https if https is used


  Commit: 303f0dc681e440e354dcab2de5f15711229be8c9
      
https://github.com/Dolibarr/dolibarr/commit/303f0dc681e440e354dcab2de5f15711229be8c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M htdocs/commissions/admin/commissions.php
    M htdocs/commissions/index.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/langs/en_US/commissions.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/fr_FR/commissions.lang
    M htdocs/langs/fr_FR/margins.lang
    M htdocs/margin/admin/margin.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/societe/soc.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4f0e4be44964...303f0dc681e4