Merge branch 'improvement/digest-pdo-params' of immanuelfodor/tt-rss into master

[tt-rss.git] / classes / db.php

diff --git a/classes/db.php b/classes/db.php
index 3f3c12680751c39703ff99e15fe54841405af40a..96a8882751078adb63d72e7ac623d9e2a87ea741 100644 (file)
--- a/classes/db.php
+++ b/classes/db.php
@@ -52,13 +52,14 @@ class Db
        private function pdo_connect() {
 
                $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
-
-               $this->pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . ';host=' . DB_HOST . $db_port,
-                       DB_USER,
-                       DB_PASS);
-
-               if (!$this->pdo) {
-                       print("Error connecting via PDO.");
+               $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+
+               try {
+                       $this->pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+                               DB_USER,
+                               DB_PASS);
+               } catch (Exception $e) {
+                       print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
                        exit(101);
                }