[Dolibarr-git] [Dolibarr/dolibarr] 356409: Fix: add json_decode function for old PHP

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 356409bd72143ec164996ff2e46e332892116c01
      
https://github.com/Dolibarr/dolibarr/commit/356409bd72143ec164996ff2e46e332892116c01
  Author: Regis Houssin <address@hidden>
  Date:   2011-11-05 (Sat, 05 Nov 2011)

  Changed paths:
    M htdocs/core/lib/ajax.lib.php
  M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix: add json_decode function for old PHP


  Commit: 40c39fb8adfc711d595bf5841a07e46896f8da2c
      
https://github.com/Dolibarr/dolibarr/commit/40c39fb8adfc711d595bf5841a07e46896f8da2c
  Author: Regis Houssin <address@hidden>
  Date:   2011-11-05 (Sat, 05 Nov 2011)

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

Conflicts:
        htdocs/core/lib/functions.lib.php


Compare: https://github.com/Dolibarr/dolibarr/compare/97f0130...40c39fb