diff --git a/ChangeLog b/ChangeLog index 01f110214c8d206b138b6875ad4e5d714f816a28..f888839413a700cc8910dffe458d113841d71dfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,7 +38,8 @@ For developers: - Removed useless code of old commercial module. - Updated wiki documentation. - Better W3C standard. - +- Can add data provided with a module. + ***** Changelog for 2.6 compared to 2.5 ***** diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index d2bcd1e6d5d4f8b2280b3e9c4bbe4470d3db89e8..dce5cc0c8d924bd61fe33d5987d60db2af8fb803 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -442,7 +442,7 @@ class DolibarrModules { while (($file = readdir($handle))!==false) { - if (eregi('\.sql$',$file) && ! eregi('\.key\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file,0,8) != 'llx_data') + if (eregi('\.sql$',$file) && ! eregi('\.key\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data') { $result=run_sql($dir.$file,1); } @@ -456,7 +456,7 @@ class DolibarrModules { while (($file = readdir($handle))!==false) { - if (eregi('\.key\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file,0,8) != 'llx_data') + if (eregi('\.key\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data') { $result=run_sql($dir.$file,1); } @@ -464,13 +464,13 @@ class DolibarrModules closedir($handle); } - // Run llx_data.sql files + // Run data.sql files $handle=@opendir($dir); // Dir may not exist if ($handle) { while (($file = readdir($handle))!==false) { - if (eregi('\.sql$',$file) && ! eregi('\.key\.sql$',$file) && substr($file,0,8) == 'llx_data') + if (eregi('\.sql$',$file) && ! eregi('\.key\.sql$',$file) && substr($file,0,4) == 'data') { $result=run_sql($dir.$file,1); }