Skip to content

Commit f6cfebb

Browse files
authored
Merge pull request #12 from topcoder-platform/issues-373
Issues-369: Fixed the image menu items for New Discussion
2 parents d32ac11 + ef69493 commit f6cfebb

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

TopcoderEditorPlugin.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ protected function canUpload() {
349349
$permissionCategory = CategoryModel::permissionCategory(Gdn::controller()->data('Category'));
350350
$discussionsUploads = CategoryModel::checkPermission($permissionCategory, 'Vanilla.Discussions.Uploads');
351351
$commentsUploads = CategoryModel::checkPermission($permissionCategory, 'Vanilla.Comments.Uploads');
352+
$categoryType = val('DisplayAs', Gdn::controller()->data('Category'));
352353
// User has both permissions
353354
if ($commentsUploads && $discussionsUploads) {
354355
$this->canUpload = true;
@@ -358,7 +359,7 @@ protected function canUpload() {
358359
case 'NewDiscussion':
359360
// Always true. User can change a category before posting discussion.
360361
// Check upload permissions on the client
361-
$this->canUpload = true;
362+
$this->canUpload = $categoryType == "Discussions"? $discussionsUploads: true;
362363
break;
363364
case 'EditDiscussion':
364365
$this->canUpload = $discussionsUploads;
@@ -375,6 +376,7 @@ protected function canUpload() {
375376
// a category is not selected, check permission on the client
376377
switch ($actionType) {
377378
case 'NewDiscussion':
379+
// Check upload permissions on the client
378380
$this->canUpload = true;
379381
break;
380382
default:

0 commit comments

Comments
 (0)