[vanillin commit] r279 - trunk/library/Vanilla/Control

[codesite...@google.com]

Author: helgith
Date: Sun Sep 30 13:42:53 2007
New Revision: 279

Modified:
trunk/library/Vanilla/Control/CommentGrid.php

Log:
Sync with Vanilla 1.1.3

Modified: trunk/library/Vanilla/Control/CommentGrid.php
==============================================================================
--- trunk/library/Vanilla/Control/CommentGrid.php (original)
+++ trunk/library/Vanilla/Control/CommentGrid.php Sun Sep 30 13:42:53 2007
@@ -44,12 +44,14 @@
$RecordDiscussionView = 0;
}
$this->Discussion = $DiscussionManager->GetDiscussionById($DiscussionID, $RecordDiscussionView);
- if ($this->Discussion) {
- $this->Discussion->FormatPropertiesForDisplay();
- if (!$this->Discussion->Active && !$session->User->Permission('PERMISSION_VIEW_HIDDEN_DISCUSSIONS')) {
- $this->Discussion = false;
- $this->Context->WarningCollector->Add($this->Context->GetDefinition('ErrDiscussionNotFound'));
- }
+ if (!$this->Discussion) {
+ $this->CallDelegate('Constructor');
+ }
+
+ $this->Discussion->FormatPropertiesForDisplay();
+ if (!$this->Discussion->Active && !$session->User->Permission('PERMISSION_VIEW_HIDDEN_DISCUSSIONS')) {
+ $this->Discussion = false;
+ $this->Context->WarningCollector->Add($this->Context->GetDefinition('ErrDiscussionNotFound'));
}

if ($this->Context->WarningCollector->Count() > 0) {
@@ -100,7 +102,9 @@
&& ($this->pl->PageCount == 1 || $this->pl->PageCount == $this->CurrentPage)
&& ((!$this->Discussion->Closed && $this->Discussion->Active) || $session->User->Permission('PERMISSION_ADD_COMMENTS_TO_CLOSED_DISCUSSION'))
&& $this->CommentData
- && $session->User->Permission('PERMISSION_ADD_COMMENTS')) $this->ShowForm = 1;
+ && $session->User->Permission('PERMISSION_ADD_COMMENTS')) {
+ $this->ShowForm = 1;
+ }
$this->CallDelegate('Constructor');
}