Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
4d52c152
Commit
4d52c152
authored
Oct 31, 2009
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Work on multicompany module with smarty integration
parent
8d41d433
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/lib/admin.lib.php
+2
-2
2 additions, 2 deletions
htdocs/lib/admin.lib.php
with
2 additions
and
2 deletions
htdocs/lib/admin.lib.php
+
2
−
2
View file @
4d52c152
...
@@ -91,7 +91,7 @@ function versiondolibarrarray()
...
@@ -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)
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment