[Fusionforge-commits] r18952 - trunk/src/common/include

Marc-Etienne VARGENAU vargenau at fusionforge.org
Mon Jan 27 15:14:23 CET 2014


Author: vargenau
Date: 2014-01-27 15:14:23 +0100 (Mon, 27 Jan 2014)
New Revision: 18952

Modified:
   trunk/src/common/include/database-pgsql.php
Log:
Update PHP Doc

Modified: trunk/src/common/include/database-pgsql.php
===================================================================
--- trunk/src/common/include/database-pgsql.php	2014-01-27 14:08:09 UTC (rev 18951)
+++ trunk/src/common/include/database-pgsql.php	2014-01-27 14:14:23 UTC (rev 18952)
@@ -155,7 +155,7 @@
  * @param	string	$file		File that contains the SQL statements.
  * @param	int	$limit		How many rows do you want returned.
  * @param	int	$offset		Of matching rows, return only rows starting here.
- * @param	int	$dbserver	ability to spread load to multiple db servers.
+ * @param	resource	$dbserver	ability to spread load to multiple db servers.
  * @return	int	result set handle.
  */
 function db_query_from_file($file, $limit = -1, $offset = 0, $dbserver = NULL) {
@@ -253,8 +253,8 @@
 		    db_error($dbserver) . "), SQL: " . $qstring,
 		    print_r(array("params" => $params), 1));
 	} else {
-		error_log('SQL: ' . preg_replace('/\n\t+/', ' ', $qstring));
-		error_log('SQL> ' . db_error($dbserver));
+		error_log('SQL: '.preg_replace('/\n\t+/', ' ', $qstring));
+		error_log('SQL> '.db_error($dbserver));
 	}
 	return $res;
 }
@@ -305,7 +305,7 @@
 	global $sysdebug_dbquery, $sysdebug_dberrors;
 
 	db_connect_if_needed();
-	$dbconn = db_switcher($dbserver) ;
+	$dbconn = db_switcher($dbserver);
 
 	global $QUERY_COUNT;
 	$QUERY_COUNT++;




More information about the Fusionforge-commits mailing list