From 7139cbb4907e78944ce418c5ca14b4f7f9b68b1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Nov 2017 19:00:43 +0100
Subject: [PATCH] Fix regression

---
 htdocs/api/index.php               | 4 +++-
 htdocs/core/lib/functions2.lib.php | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index e10ebba0e62..09f5cdb7cfe 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -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);
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4f1ed15d676..7ba73df91df 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -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';