[openaria-Commits] r2510 - in branches/1.6.0-develop: . app obj

[mbi...@adullact.net]

Author: mbideau
Date: 2019-03-14 16:25:25 +0100 (Thu, 14 Mar 2019)
New Revision: 2510

Added:
branches/1.6.0-develop/app/php/
Modified:
branches/1.6.0-develop/
branches/1.6.0-develop/obj/openaria.class.php
Log:
Merge de 'r2507' du 'trunk' dans la branche '1.6.0-develop' correspondant au commit suivant: Externals: ajout du r?\195?\169pertoire 'app/php' contenant les librairies externes 'pear' et 'db' et remplacement de leur inclusion dans le fichier 'obj/openaria.class.php'

Index: branches/1.6.0-develop
===================================================================
--- branches/1.6.0-develop 2019-03-11 11:08:37 UTC (rev 2509)
+++ branches/1.6.0-develop 2019-03-14 15:25:25 UTC (rev 2510)

Property changes on: branches/1.6.0-develop
___________________________________________________________________
Modified: svn:mergeinfo
## -26,4 +26,4 ##
/branches/trunk_bug_dc_contacts:2165-2171
/branches/trunk_evo_OM_4.6:2168-2201
/branches/trunk_sur_fmwk_4.9.0:2345-2368
-/trunk:2496,2499-2500
\ No newline at end of property
+/trunk:2496,2499-2500,2507
\ No newline at end of property
Modified: branches/1.6.0-develop/obj/openaria.class.php
===================================================================
--- branches/1.6.0-develop/obj/openaria.class.php 2019-03-11 11:08:37 UTC (rev 2509)
+++ branches/1.6.0-develop/obj/openaria.class.php 2019-03-14 15:25:25 UTC (rev 2510)
@@ -34,8 +34,8 @@
get_include_path().PATH_SEPARATOR.implode(
PATH_SEPARATOR,
array(
- getcwd()."/../php/pear",
- getcwd()."/../php/db",
+ getcwd()."/../app/php/pear",
+ getcwd()."/../app/php/db",
getcwd()."/../php/fpdf",
getcwd()."/../php/phpmailer",
getcwd()."/../php/tcpdf",