Merge branch 'tiny-oop'

1 files changed, 2 insertions, 16 deletions

diff --git a/update_daemon2.php b/update_daemon2.php
index 06271de85..27b4c35d6 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -133,13 +133,7 @@
 	// It is unnecessary to start the fork loop if database is not ok.
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!$link) {
-		if (DB_TYPE == "mysql") {
-			print mysql_error();
-		}
-		// PG seems to display its own errors just fine by default.
-		return;
-	}
+	if (!init_connection($link)) return;
 
 	db_close($link);
 
@@ -190,15 +184,7 @@
 
 					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-					if (!$link) {
-						if (DB_TYPE == "mysql") {
-							print mysql_error();
-						}
-						// PG seems to display its own errors just fine by default.
-						return;
-					}
-
-					init_connection($link);
+					if (!init_connection($link)) return;
 
 					// We disable stamp file, since it is of no use in a multiprocess update.
 					// not really, tho for the time being -fox