Fixed some small issues

diff --git a/files/lib/data/conversation/ConversationAction.class.php b/files/lib/data/conversation/ConversationAction.class.php
index e631221c50ee52690de926461e159880a868d6e4..4205184414a309837f06af89b886122be66d0df5 100644 (file)
--- a/files/lib/data/conversation/ConversationAction.class.php
+++ b/files/lib/data/conversation/ConversationAction.class.php
@@ -74,15 +74,15 @@ class ConversationAction extends AbstractDatabaseObjectAction implements IClipbo
                        $conversationEditor->updateParticipants(array($data['userID']));
                        
                        // update conversation count
-                       UserStorageHandler::getInstance()->reset(array($data['userID']), 'conversationCount', PackageDependencyHandler::getInstance()->getPackageID('com.woltlab.wcf.conversation'));
-                       
+                       UserStorageHandler::getInstance()->reset($conversation->getParticipantIDs(), 'conversationCount', PackageDependencyHandler::getInstance()->getPackageID('com.woltlab.wcf.conversation'));
+               
                        // fire notification event
                        $notificationRecipients = array_merge((!empty($this->parameters['participants']) ? $this->parameters['participants'] : array()), (!empty($this->parameters['invisibleParticipants']) ? $this->parameters['invisibleParticipants'] : array()));
                        UserNotificationHandler::getInstance()->fireEvent('conversation', 'com.woltlab.wcf.conversation.notification', new ConversationUserNotificationObject($conversation), $notificationRecipients);
                }
                else {
                        // update conversation count
-                       UserStorageHandler::getInstance()->reset($conversation->getParticipantIDs(), 'conversationCount', PackageDependencyHandler::getInstance()->getPackageID('com.woltlab.wcf.conversation'));
+                       UserStorageHandler::getInstance()->reset(array($data['userID']), 'conversationCount', PackageDependencyHandler::getInstance()->getPackageID('com.woltlab.wcf.conversation'));
                }
                
                // update participant summary

diff --git a/files/lib/data/conversation/message/ConversationMessageAction.class.php b/files/lib/data/conversation/message/ConversationMessageAction.class.php
index 11fc7ef89bcbe05ae3ed256fcc2a934d5a2fdcbd..f2f1a6aa97001b3cc4f17523100b9c8944f94599 100644 (file)
--- a/files/lib/data/conversation/message/ConversationMessageAction.class.php
+++ b/files/lib/data/conversation/message/ConversationMessageAction.class.php
@@ -74,24 +74,24 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
                $message = parent::create();
                
                // get thread
-               $converation = (isset($this->parameters['converation']) ? $this->parameters['converation'] : new Conversation($message->conversationID));
-               $conversationEditor = new ConversationEditor($converation);
+               $conversation = (isset($this->parameters['converation']) ? $this->parameters['converation'] : new Conversation($message->conversationID));
+               $conversationEditor = new ConversationEditor($conversation);
                
                if (empty($this->parameters['isFirstPost'])) {
                        // update last message
                        $conversationEditor->addMessage($message);
                        
                        // fire notification event
-                       if (!$converation->isDraft) {
-                               UserNotificationHandler::getInstance()->fireEvent('conversationMessage', 'com.woltlab.wcf.conversation.message.notification', new ConversationMessageUserNotificationObject($message), $converation->getParticipantIDs());
+                       if (!$conversation->isDraft) {
+                               UserNotificationHandler::getInstance()->fireEvent('conversationMessage', 'com.woltlab.wcf.conversation.message.notification', new ConversationMessageUserNotificationObject($message), $conversation->getParticipantIDs());
                        }
                }
                
                // reset storage
-               UserStorageHandler::getInstance()->reset($converation->getParticipantIDs(), 'unreadConversationCount', PackageDependencyHandler::getInstance()->getPackageID('com.woltlab.wcf.conversation'));
+               UserStorageHandler::getInstance()->reset($conversation->getParticipantIDs(), 'unreadConversationCount', PackageDependencyHandler::getInstance()->getPackageID('com.woltlab.wcf.conversation'));
                
                // update search index
-               SearchIndexManager::getInstance()->add('com.woltlab.wcf.conversation.message', $message->messageID, $message->message, (!empty($this->parameters['isFirstPost']) ? $converation->subject : ''), $message->time, $message->userID, $message->username);
+               SearchIndexManager::getInstance()->add('com.woltlab.wcf.conversation.message', $message->messageID, $message->message, (!empty($this->parameters['isFirstPost']) ? $conversation->subject : ''), $message->time, $message->userID, $message->username);
                
                // update attachments
                if (isset($this->parameters['attachmentHandler']) && $this->parameters['attachmentHandler'] !== null) {

diff --git a/templates/conversationMessageEdit.tpl b/templates/conversationMessageEdit.tpl
index 212d282dd60744fad47195a69fd8204d90eba229..f6a49d9d49936020237a2ed192a0afb5afcc2a85 100644 (file)
--- a/templates/conversationMessageEdit.tpl
+++ b/templates/conversationMessageEdit.tpl
@@ -40,6 +40,26 @@
                        <fieldset>
                                <legend>{lang}wcf.conversation.information{/lang}</legend>
                                
+                               <dl{if $errorField == 'subject'} class="formError"{/if}>
+                                       <dt><label for="subject">{lang}wcf.global.subject{/lang}</label></dt>
+                                       <dd>
+                                               <input type="text" id="subject" name="subject" value="{$subject}" required="true" class="long" />
+                                               {if $errorField == 'subject'}
+                                                       <small class="innerError">
+                                                               {if $errorType == 'empty'}
+                                                                       {lang}wcf.global.form.error.empty{/lang}
+                                                               {else}
+                                                                       {lang}wcf.conversation.subject.error.{@$errorType}{/lang}
+                                                               {/if}
+                                                       </small>
+                                               {/if}
+                                       </dd>
+                               </dl>
+                       </fieldset>
+                       
+                       <fieldset>
+                               <legend>{lang}wcf.conversation.participants{/lang}</legend>
+                               
                                {if $conversation->isDraft}
                                        <dl{if $errorField == 'participants'} class="formError"{/if}>
                                                <dt><label for="participants">{lang}wcf.conversation.participants{/lang}</label></dt>
@@ -89,22 +109,6 @@
                                                <label><input type="checkbox" name="participantCanInvite" id="participantCanInvite" value="1"{if $participantCanInvite} checked="checked"{/if} /> {lang}wcf.conversation.participantCanInvite{/lang}</label>
                                        </dd>
                                </dl>
-                               
-                               <dl{if $errorField == 'subject'} class="formError"{/if}>
-                                       <dt><label for="subject">{lang}wcf.global.subject{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="subject" name="subject" value="{$subject}" required="true" class="long" />
-                                               {if $errorField == 'subject'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.conversation.subject.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
                        </fieldset>
                {/if}