Proper use of the DebugPreparedStatement class

Fixes #2955

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 7f13bd6453482101b20adbc980415d6f8dded653..418180f678bdf969c17229610ebb6d6d36dbc972 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -389,6 +389,10 @@ class WCF {
                                
                                require($filename);
                        }
+                       
+                       if (ENABLE_DEBUG_MODE) {
+                               self::$dbObj->enableDebugMode();
+                       }
                }
        }
        

diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php
index 1ee45f5aeff3a6ba543f222d0144df34fffd0738..4c426bfd16e96eb9cdfa02f8ccd1b8d5838060bb 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/Database.class.php
+++ b/wcfsetup/install/files/lib/system/database/Database.class.php
@@ -124,14 +124,14 @@ abstract class Database {
                $this->tryToCreateDatabase = $tryToCreateDatabase;
                $this->defaultDriverOptions = $defaultDriverOptions;
                
-               if (defined('ENABLE_DEBUG_MODE') && ENABLE_DEBUG_MODE) {
-                       $this->preparedStatementClassName = DebugPreparedStatement::class;
-               }
-               
                // connect database
                $this->connect();
        }
        
+       public function enableDebugMode() {
+               $this->preparedStatementClassName = DebugPreparedStatement::class;
+       }
+       
        /**
         * Connects to database server.
         */