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

Work on multicompany module with smarty integration

Browse Source
This commit is contained in:
Regis Houssin 2009-10-31 07:01:37 +00:00
parent 8d41d43385
commit 4d52c1525e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/lib/admin.lib.php
View File

@ -91,7 +91,7 @@ function versiondolibarrarray()
* \param sqlfile Full path to sql file * \param sqlfile Full path to sql file
* \return int <=0 if KO, >0 if OK * \return int <=0 if KO, >0 if OK
*/ */
function run_sql($sqlfile,$silent=1) function run_sql($sqlfile,$silent=1,$entity='')
{ {
global $db, $conf, $langs, $user; global $db, $conf, $langs, $user;
@ -228,7 +228,7 @@ function run_sql($sqlfile,$silent=1)
while (preg_match('/(__ENTITY__)/i',$newsql,$reg)) while (preg_match('/(__ENTITY__)/i',$newsql,$reg))
{ {
$from = $reg[1]; $from = $reg[1];
$to = $conf->entity; $to = (!empty($entity)?$entity:$conf->entity);
$newsql = str_replace($from,$to,$newsql); $newsql = str_replace($from,$to,$newsql);
dol_syslog('Admin.lib::run_sql New Request '.($i+1).' sql='.$newsql, LOG_DEBUG); dol_syslog('Admin.lib::run_sql New Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
} }