Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Bad path on fedora

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-04 13:58:14 +00:00
parent ea877549b2
commit bf1c5c0dea
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/lib/databases/mssql.lib.php
View File

@@ -21,7 +21,7 @@
/** /**
* \file htdocs/lib/databases/mssql.lib.php * \file htdocs/lib/databases/mssql.lib.php
* \brief Fichier de la classe permettant de gerer une base mssql * \brief Fichier de la classe permettant de gerer une base mssql
* \version $Id: mssql.lib.php,v 1.86 2011/07/31 23:26:03 eldy Exp $ * \version $Id: mssql.lib.php,v 1.87 2011/08/04 13:58:14 eldy Exp $
*/ */
// Pour compatibilite lors de l'upgrade // Pour compatibilite lors de l'upgrade
@@ -1022,14 +1022,24 @@ class DoliDb
return ''; // attente debugage return ''; // attente debugage
} }
/*
* Return full path of dump program
* @return string Full path of dump program
*/
function getPathOfDump() function getPathOfDump()
{ {
return '';
} }
/**
* Return full path of restore program
* @return string Full path of restore program
*/
function getPathOfRestore() function getPathOfRestore()
{ {
return '';
} }
} }

4
htdocs/lib/databases/mysql.lib.php
View File

@@ -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.120 2011/08/04 13:58:14 eldy Exp $ * \version $Id: mysql.lib.php,v 1.121 2011/08/04 13:58:55 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', '../..');
@@ -1174,7 +1174,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;
} }