Fixed user storage reset/update race condition

diff --git a/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php b/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php
index 272eb741000738b28950757539ea9a65d4a69fee..6b5f2de5c7e506a7c9c57d84d1181585ba405570 100644 (file)
--- a/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php
@@ -102,9 +102,6 @@ class UserStorageHandler extends SingletonFactory {
                }
                
                $this->cache[$userID][$field] = $fieldValue;
-               
-               // flag key as outdated
-               self::reset(array($userID), $field);
        }
        
        /**
@@ -165,18 +162,35 @@ class UserStorageHandler extends SingletonFactory {
                
                // insert data
                if (!empty($this->updateFields)) {
-                       $sql = "INSERT INTO     wcf".WCF_N."_user_storage
-                                               (userID, field, fieldValue)
-                               VALUES          (?, ?, ?)";
-                       $statement = WCF::getDB()->prepareStatement($sql);
-                       
+                       // exclude values which should be resetted
                        foreach ($this->updateFields as $userID => $fieldValues) {
-                               foreach ($fieldValues as $field => $fieldValue) {
-                                       $statement->execute(array(
-                                               $userID,
-                                               $field,
-                                               $fieldValue
-                                       ));
+                               if (isset($this->resetFields[$userID])) {
+                                       foreach ($fieldValues as $field => $fieldValue) {
+                                               if (in_array($field, $this->resetFields[$userID])) {
+                                                       unset($this->updateFields[$userID][$field]);
+                                               }
+                                       }
+                                       
+                                       if (empty($this->updateFields[$userID])) {
+                                               unset($this->updateFields[$userID]);
+                                       }
+                               }
+                       }
+                       
+                       if (!empty($this->updateFields)) {
+                               $sql = "REPLACE INTO    wcf".WCF_N."_user_storage
+                                                       (userID, field, fieldValue)
+                                       VALUES          (?, ?, ?)";
+                               $statement = WCF::getDB()->prepareStatement($sql);
+                               
+                               foreach ($this->updateFields as $userID => $fieldValues) {
+                                       foreach ($fieldValues as $field => $fieldValue) {
+                                               $statement->execute(array(
+                                                       $userID,
+                                                       $field,
+                                                       $fieldValue
+                                               ));
+                                       }
                                }
                        }
                }