From bf1c5c0dea197c99a7b5f10a99ba80618ec5af0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 4 Aug 2011 13:58:14 +0000
Subject: [PATCH] Fix: Bad path on fedora

---
 htdocs/lib/databases/mssql.lib.php | 12 +++++++++++-
 htdocs/lib/databases/mysql.lib.php |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index 9328e2cb852..b99a1678444 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -21,7 +21,7 @@
 /**
  *	\file       	htdocs/lib/databases/mssql.lib.php
  *	\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
@@ -1022,14 +1022,24 @@ class DoliDb
 		return ''; // attente debugage
 	}
 
+	/*
+	 *  Return full path of dump program
+	 *	@return		string		Full path of dump program
+	 */
 	function getPathOfDump()
 	{
 
+	    return '';
 	}
 
+    /**
+     *	Return full path of restore program
+     *	@return		string		Full path of restore program
+     */
 	function getPathOfRestore()
 	{
 
+	    return '';
 	}
 }
 
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 291d608a2a3..d7d36383a24 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -22,7 +22,7 @@
 /**
  *	\file       	htdocs/lib/databases/mysql.lib.php
  *	\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
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
@@ -1174,7 +1174,7 @@ class DoliDb
 		{
 			$liste=$this->fetch_array($resql);
 			$basedir=$liste['Value'];
-			$fullpathofimport=$basedir.'bin/mysql';
+			$fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
 		}
 		return $fullpathofimport;
 	}