From 8ed281ceea8a77798f583a7064fe5b6337eaf0c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 10 Jan 2011 01:08:40 +0000
Subject: [PATCH] Fix: Path to postgresql dump

---
 htdocs/lib/databases/pgsql.lib.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 1bf0087a294..29f3d2ca9f3 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -1206,18 +1206,25 @@ class DoliDb
 	/**
 	 *	\brief		Return full path of dump program
 	 *	\return		string		Full path of dump program
-	 *  TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 	 */
 	function getPathOfDump()
 	{
 		$fullpathofdump='/pathtopgdump/pg_dump';
 
-		$resql=$this->query('SHOW data_directory');
-		if ($resql)
+		if (file_exists('/usr/bin/pg_dump'))
 		{
-			$liste=$this->fetch_array($resql);
-			$basedir=$liste['data_directory'];
-			$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
+		    $fullpathofdump='/usr/bin/pg_dump';
+		}
+		else
+		{
+            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+		    $resql=$this->query('SHOW data_directory');
+    		if ($resql)
+    		{
+    			$liste=$this->fetch_array($resql);
+    			$basedir=$liste['data_directory'];
+    			$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
+    		}
 		}
 
 		return $fullpathofdump;