Add \wcf\getRequestId() to request information in SQL queries

diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php
index 4c426bfd16e96eb9cdfa02f8ccd1b8d5838060bb..8fd5af789d7341eaffda241f28bea4299b460e25 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/Database.class.php
+++ b/wcfsetup/install/files/lib/system/database/Database.class.php
@@ -261,7 +261,7 @@ abstract class Database {
                        //       must be absolutely lightweight.
                        $requestInformation = '';
                        if (defined('ENABLE_PRODUCTION_DEBUG_MODE') && ENABLE_PRODUCTION_DEBUG_MODE && isset($_SERVER['REQUEST_URI'])) {
-                               $requestInformation = substr($_SERVER['REQUEST_URI'], 0, 90);
+                               $requestInformation = substr($_SERVER['REQUEST_URI'].(\wcf\getRequestId() ? ' ('.\wcf\getRequestId().')' : ''), 0, 90);
                                if (isset($_REQUEST['className']) && isset($_REQUEST['actionName'])) {
                                        $requestInformation .= ' ('.$_REQUEST['className'].':'.$_REQUEST['actionName'].')';
                                }