From 99df0c71c8d24bbac7f06c8a8fb4d2fd821d41f5 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 2 Apr 2014 15:46:55 +0200 Subject: [PATCH] Fixed SQL error in modification log handler --- .../log/modification/ModificationLogHandler.class.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php b/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php index aa0b4d5e63..47a1bb08c9 100644 --- a/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php +++ b/wcfsetup/install/files/lib/system/log/modification/ModificationLogHandler.class.php @@ -65,12 +65,18 @@ class ModificationLogHandler extends SingletonFactory { throw new SystemException("Object type '".$objectType."' not found within definition 'com.woltlab.wcf.modifiableContent'"); } + if ($userID === null) $userID = WCF::getUser()->userID; + if ($username === null) { + if (WCF::getUser()->username) $username = WCF::getUser()->username; + else $username = ''; + } + return ModificationLogEditor::create(array( 'objectTypeID' => $objectTypeObj->objectTypeID, 'objectID' => $objectID, 'action' => $action, - 'userID' => ($userID === null ? WCF::getUser()->userID : $userID), - 'username' => ($username === null ? WCF::getUser()->username : $username), + 'userID' => $userID, + 'username' => $username, 'time' => $time, 'additionalData' => serialize($additionalData) )); -- 2.20.1