Possible fix for #125, applied fixes from profi-concept's branch

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 446518563af4851587ea218b24a246efe7a9b225..5ad12fcb5d8f163413c9f72ee902cc89cf5fe141 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,6 +57,9 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
 // Set error handler
 set_error_handler('__errorHandler');
 

+// Init error handler
+initErrorHandler();
+

 // Init request
 initRequest();
 
 // Init request
 initRequest();
 


@@ -87,6 +90,9 @@ if ((!isInstalling()) && (isInstalled())) {
 
                // Is the link valid?
                if (SQL_IS_LINK_UP()) {
 
                // Is the link valid?
                if (SQL_IS_LINK_UP()) {

+                       // Enable exit on error
+                       enableExitOnError();
+

                        // Is it a valid resource?
                        if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
                                // This is required for extension 'optimize' to work
                        // Is it a valid resource?
                        if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
                                // This is required for extension 'optimize' to work