Skip to content
Snippets Groups Projects
Commit ea877549 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Bad path on fedora

parent 5fd13bc2
No related branches found
No related tags found
No related merge requests found
...@@ -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.119 2011/07/31 23:26:03 eldy Exp $ * \version $Id: mysql.lib.php,v 1.120 2011/08/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;
} }
......
...@@ -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.114 2011/08/04 13:58:14 eldy Exp $ * \version $Id: mysqli.lib.php,v 1.115 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;
} }
......
...@@ -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.110 2011/07/31 23:26:03 eldy Exp $ * \version $Id: pgsql.lib.php,v 1.111 2011/08/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';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment