From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Fri, 17 Jul 2015 15:28:30 +0000 (+0100)
Subject: template, fix bug on nav
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=91d9b2bdabeeb3c1d0cb2bc15bdc39a68995b43a;p=nb.git

template, fix bug on nav
---

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index c30ac292..24f9cc59 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -640,7 +640,6 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog.
   }
 
   function rows_end_csv() {
-    return $this->nav($opt['count'],$opt['tot'],$opt['limit']);
     return '';
   }
 
diff --git a/lib/php/functions.php b/lib/php/functions.php
index dfd5206b..38f1aa8a 100644
--- a/lib/php/functions.php
+++ b/lib/php/functions.php
@@ -164,25 +164,24 @@ function cmd2str($cmd,$write=null) {
 
 	$process = proc_open($cmd, $descriptorspec, $pipes);
 
-	if (is_resource($process)) {
+	if (!is_resource($process)) return;
 
-		if ($write !== null) fwrite($pipes[0], $write);
-		// Il est important que vous fermiez les pipes avant d'appeler
-		// proc_close afin d'éviter un verrouillage.
-		fclose($pipes[0]);
+  if ($write !== null) fwrite($pipes[0], $write);
+  // Il est important que vous fermiez les pipes avant d'appeler
+  // proc_close afin d'éviter un verrouillage.
+  fclose($pipes[0]);
 
-		while (!feof($pipes[1])) {
-		  $return_content .= fread($pipes[1], 8192);
-		}
+  $return_content = '';
+  while (!feof($pipes[1])) {
+    $return_content .= fread($pipes[1], 8192);
+  }
 
-		fclose($pipes[1]);
+  fclose($pipes[1]);
 
-		$return_value = proc_close($process);
+  $return_value = proc_close($process);
 
 #die(strlen($write));
-		return $return_content;
-
-	}
+  return $return_content;
 
 }