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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
ea877549
Commit
ea877549
authored
13 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Bad path on fedora
parent
5fd13bc2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/lib/databases/mysql.lib.php
+4
-4
4 additions, 4 deletions
htdocs/lib/databases/mysql.lib.php
htdocs/lib/databases/mysqli.lib.php
+2
-2
2 additions, 2 deletions
htdocs/lib/databases/mysqli.lib.php
htdocs/lib/databases/pgsql.lib.php
+7
-7
7 additions, 7 deletions
htdocs/lib/databases/pgsql.lib.php
with
13 additions
and
13 deletions
htdocs/lib/databases/mysql.lib.php
+
4
−
4
View file @
ea877549
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
/**
/**
* \file htdocs/lib/databases/mysql.lib.php
* \file htdocs/lib/databases/mysql.lib.php
* \brief Class file to manage Dolibarr database access for a Mysql database
* \brief Class file to manage Dolibarr database access for a Mysql database
* \version $Id: mysql.lib.php,v 1.1
19
2011/0
7/31 23:26:03
eldy Exp $
* \version $Id: mysql.lib.php,v 1.1
20
2011/0
8/04 13:58:14
eldy Exp $
*/
*/
// For compatibility during upgrade
// For compatibility during upgrade
if
(
!
defined
(
'DOL_DOCUMENT_ROOT'
))
define
(
'DOL_DOCUMENT_ROOT'
,
'../..'
);
if
(
!
defined
(
'DOL_DOCUMENT_ROOT'
))
define
(
'DOL_DOCUMENT_ROOT'
,
'../..'
);
...
@@ -1144,8 +1144,8 @@ class DoliDb
...
@@ -1144,8 +1144,8 @@ class DoliDb
}
}
/**
/**
*
\brief
Return full path of dump program
* Return full path of dump program
*
\
return string Full path of dump program
*
@
return string Full path of dump program
*/
*/
function
getPathOfDump
()
function
getPathOfDump
()
{
{
...
@@ -1156,7 +1156,7 @@ class DoliDb
...
@@ -1156,7 +1156,7 @@ class DoliDb
{
{
$liste
=
$this
->
fetch_array
(
$resql
);
$liste
=
$this
->
fetch_array
(
$resql
);
$basedir
=
$liste
[
'Value'
];
$basedir
=
$liste
[
'Value'
];
$fullpathofdump
=
$basedir
.
'bin/mysqldump'
;
$fullpathofdump
=
$basedir
.
(
preg_match
(
'/\/$/'
,
$basedir
)
?
''
:
'/'
)
.
'bin/mysqldump'
;
}
}
return
$fullpathofdump
;
return
$fullpathofdump
;
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/lib/databases/mysqli.lib.php
+
2
−
2
View file @
ea877549
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
/**
/**
* \file htdocs/lib/databases/mysqli.lib.php
* \file htdocs/lib/databases/mysqli.lib.php
* \brief Class file to manage Dolibarr database access for a Mysql database
* \brief Class file to manage Dolibarr database access for a Mysql database
* \version $Id: mysqli.lib.php,v 1.11
4
2011/08/04 13:58:
14
eldy Exp $
* \version $Id: mysqli.lib.php,v 1.11
5
2011/08/04 13:58:
55
eldy Exp $
*/
*/
// For compatibility during upgrade
// For compatibility during upgrade
...
@@ -1185,7 +1185,7 @@ class DoliDb
...
@@ -1185,7 +1185,7 @@ class DoliDb
{
{
$liste
=
$this
->
fetch_array
(
$resql
);
$liste
=
$this
->
fetch_array
(
$resql
);
$basedir
=
$liste
[
'Value'
];
$basedir
=
$liste
[
'Value'
];
$fullpathofimport
=
$basedir
.
'bin/mysql'
;
$fullpathofimport
=
$basedir
.
(
preg_match
(
'/\/$/'
,
$basedir
)
?
''
:
'/'
)
.
'bin/mysql'
;
}
}
return
$fullpathofimport
;
return
$fullpathofimport
;
}
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/lib/databases/pgsql.lib.php
+
7
−
7
View file @
ea877549
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
/**
/**
* \file htdocs/lib/databases/pgsql.lib.php
* \file htdocs/lib/databases/pgsql.lib.php
* \brief Fichier de la classe permettant de gerer une base pgsql
* \brief Fichier de la classe permettant de gerer une base pgsql
* \version $Id: pgsql.lib.php,v 1.11
0
2011/0
7/31 23:26:03
eldy Exp $
* \version $Id: pgsql.lib.php,v 1.11
1
2011/0
8/04 13:58:14
eldy Exp $
*/
*/
// For compatibility during upgrade
// For compatibility during upgrade
if
(
!
defined
(
'DOL_DOCUMENT_ROOT'
))
define
(
'DOL_DOCUMENT_ROOT'
,
'../..'
);
if
(
!
defined
(
'DOL_DOCUMENT_ROOT'
))
define
(
'DOL_DOCUMENT_ROOT'
,
'../..'
);
...
@@ -1233,8 +1233,8 @@ class DoliDb
...
@@ -1233,8 +1233,8 @@ class DoliDb
}
}
/**
/**
*
\brief
Return full path of dump program
* Return full path of dump program
*
\
return string Full path of dump program
*
@
return string Full path of dump program
*/
*/
function
getPathOfDump
()
function
getPathOfDump
()
{
{
...
@@ -1259,10 +1259,10 @@ class DoliDb
...
@@ -1259,10 +1259,10 @@ class DoliDb
return
$fullpathofdump
;
return
$fullpathofdump
;
}
}
/**
/**
* \brief
Return full path of restore program
*
Return full path of restore program
*
\
return string Full path of restore program
*
@
return string Full path of restore program
*/
*/
function
getPathOfRestore
()
function
getPathOfRestore
()
{
{
$fullpathofdump
=
'/pathtopgrestore/pg_restore'
;
$fullpathofdump
=
'/pathtopgrestore/pg_restore'
;
...
...
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