Skip to content

Commit 167ae8d

Browse files
authored
Merge pull request #314 from topcoder-platform/issues-308
Issues-308: supporting old and new formats
2 parents bb8f837 + c00dd0d commit 167ae8d

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ RUN composer install --working-dir /vanillapp/plugins/Topcoder
4848
RUN composer install --working-dir /vanillapp/plugins/Filestack
4949
# Install Groups dependencies
5050
RUN composer install --working-dir /vanillapp/plugins/Groups
51+
# Install TopcoderEditor dependencies
52+
RUN composer install --working-dir /vanillapp/plugins/TopcoderEditor
5153
# Copy Vanilla configuration files
5254
COPY ./config/vanilla/. /vanillapp/conf/.
5355
# Copy Topcoder Vanilla files

config/vanilla/config.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
$Configuration['EnabledPlugins']['stubcontent'] = false;
2727
$Configuration['EnabledPlugins']['Topcoder'] = true;
2828
$Configuration['EnabledPlugins']['TopcoderEditor'] = true;
29-
$Configuration['EnabledPlugins']['rich-editor'] = false;
29+
$Configuration['EnabledPlugins']['rich-editor'] = true;
3030
$Configuration['EnabledPlugins']['editor'] = false;
3131
$Configuration['EnabledPlugins']['emojiextender'] = true;
3232
$Configuration['EnabledPlugins']['GooglePrettify'] = true;
@@ -60,6 +60,7 @@
6060
$Configuration['Garden']['UpdateToken'] = '105e786dc643fd20143d3c137b593af168560c13';
6161
$Configuration['Garden']['InputFormatter'] = 'Markdown';
6262
$Configuration['Garden']['MobileInputFormatter'] = 'Markdown';
63+
$Configuration['Garden']['ForceInputFormatter'] = false;
6364
$Configuration['Garden']['Version'] = 'Undefined';
6465
$Configuration['Garden']['CanProcessImages'] = true;
6566
$Configuration['Garden']['Theme'] = 'topcoder';

vanilla/applications/vanilla/controllers/class.postcontroller.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,9 @@ public function editDiscussion($discussionID = '', $draftID = '') {
446446
}
447447
} else {
448448
$record = $this->DiscussionModel->getID($discussionID);
449+
// FIX: Issues-308: Editor - supporting old and new formats
450+
$this->EventArguments['Discussion'] = &$record;
451+
$this->fireEvent('BeforeEditDiscussion');
449452
$this->setData('Discussion', $record, true);
450453
$this->CategoryID = $this->Discussion->CategoryID;
451454
}

0 commit comments

Comments
 (0)