lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-05 19:00:43 +01:00
parent a329f7dc75
commit 7139cbb490
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/api/index.php
View File

@ -252,7 +252,9 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json'
}
else
{
$classfile = str_replace('_', '', preg_replace('/api$/i','', $module));
$tmpmodule = $module;
if ($tmpmodule != 'api') $tmpmodule = preg_replace('/api$/i','', $tmpmodule);
$classfile = str_replace('_', '', $tmpmodule);
if ($module == 'supplierinvoices') $classfile = 'supplier_invoices';
if ($module == 'supplierorders') $classfile = 'supplier_orders';
$dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_'.$classfile.'.class.php', 0, 2);

3
htdocs/core/lib/functions2.lib.php
View File

@ -2192,7 +2192,8 @@ function cartesianArray(array $input) {
*/
function getModuleDirForApiClass($module)
{
$moduledirforclass=preg_replace('/api$/i','',$module);
$moduledirforclass=$module;
if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
if ($module == 'contracts') {
$moduledirforclass = 'contrat';