[Dolibarr-git] [Dolibarr/dolibarr] 3354b3: Fix: Avoid warning if param is empty

[Regis Houssin]

  Branch: refs/heads/3.2.1
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3354b35e758d79db718a5eba2fcc5cea2d9b288e
      
https://github.com/Dolibarr/dolibarr/commit/3354b35e758d79db718a5eba2fcc5cea2d9b288e
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

  Log Message:
  -----------
  Fix: Avoid warning if param is empty


  Commit: cfa8ca5c52317bb7091b464aaf065d1875ab339c
      
https://github.com/Dolibarr/dolibarr/commit/cfa8ca5c52317bb7091b464aaf065d1875ab339c
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M htdocs/imports/class/import.class.php
    M htdocs/imports/emptyexample.php

  Log Message:
  -----------
  Fix: Removed warning


  Commit: cb6f9f40b81f65e8467a6afb094ae0bbb4d8f9e4
      
https://github.com/Dolibarr/dolibarr/commit/cb6f9f40b81f65e8467a6afb094ae0bbb4d8f9e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Prepare release


  Commit: a00439b375190d6da42b3b3e0f788ac1d1e5eb29
      
https://github.com/Dolibarr/dolibarr/commit/a00439b375190d6da42b3b3e0f788ac1d1e5eb29
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php
    M htdocs/install/inc.php
    M htdocs/support/inc.php

  Log Message:
  -----------
  Prepare release


  Commit: 657c7eb4cfb7c77c3ca437ba61276e113828e89d
      
https://github.com/Dolibarr/dolibarr/commit/657c7eb4cfb7c77c3ca437ba61276e113828e89d
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Log Message:
  -----------
  Merge branch '3.2' of ssh://address@hidden/Dolibarr/dolibarr.git into
3.2

Conflicts:
        build/exe/doliwamp/doliwamp.iss
        build/makepack-howto.txt


  Commit: 6bd438fc7fbf6b21ffb746302818480754720a1b
      
https://github.com/Dolibarr/dolibarr/commit/6bd438fc7fbf6b21ffb746302818480754720a1b
  Author: simnandez <address@hidden>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Doc: Update ChangeLog


  Commit: 4ef651d50bef90612924a500c7741e3191a52e50
      
https://github.com/Dolibarr/dolibarr/commit/4ef651d50bef90612924a500c7741e3191a52e50
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #231 from simnandez/3.2

3.2


  Commit: 8c030f4f81155af75d6c69986304f5336de322b2
      
https://github.com/Dolibarr/dolibarr/commit/8c030f4f81155af75d6c69986304f5336de322b2
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M scripts/invoices/rebuild_merge_pdf.php

  Log Message:
  -----------
  Fix: rebuild_merge_pdf does not regenerate files already existing by
default.


  Commit: cb044443012cb3d1fb367542cd7153ea19b81487
      
https://github.com/Dolibarr/dolibarr/commit/cb044443012cb3d1fb367542cd7153ea19b81487
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php

  Log Message:
  -----------
  Fix: If option to not manage a login is on, login is not output into
info message.
Fix: Bad error management


  Commit: 9fed7fba30b601db647fc003e4d5bf42fd4e15ed
      
https://github.com/Dolibarr/dolibarr/commit/9fed7fba30b601db647fc003e4d5bf42fd4e15ed
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Fix: missing not empty test


  Commit: d941d1efeeded6ac0582a360ff0dbe681edfc2fa
      
https://github.com/Dolibarr/dolibarr/commit/d941d1efeeded6ac0582a360ff0dbe681edfc2fa
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/core/lib/json.lib.php
    M htdocs/imports/class/import.class.php
    M htdocs/imports/emptyexample.php
    M htdocs/install/inc.php
    M htdocs/master.inc.php
    M htdocs/support/inc.php
    M scripts/invoices/rebuild_merge_pdf.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
        build/makepack-dolibarr.pl
        htdocs/filefunc.inc.php
        htdocs/install/inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9b1047eea7d3...d941d1efeede