@@ -558,7 +558,7 @@ public function categoryModel_hasWatched_create(CategoryModel $sender) {
558
558
}
559
559
}
560
560
561
- $ metaData = $ userMetaModel ->getUserMeta (Gdn:: session ()-> UserID , $ newCommentKey );
561
+ $ metaData = $ userMetaModel ->getUserMeta ($ userID , $ newCommentKey );
562
562
foreach ($ metaData as $ key => $ value ) {
563
563
if ($ value != null ) {
564
564
return true ;
@@ -603,8 +603,7 @@ public function discussionModel_beforeRecordAdvancedNotification_handler($sender
603
603
}
604
604
$ data ["HeadlineFormat " ] = $ headline ;
605
605
// Format to Html
606
- $ story = Gdn::formatService ()->renderHTML ($ discussion ['Body ' ], $ discussion ['Format ' ]);
607
- $ message = $ story ; // htmlspecialchars(Gdn_Format::plainText($story, 'Html'));
606
+ $ message = Gdn::formatService ()->renderQuote ($ discussion ['Body ' ], $ discussion ['Format ' ]);
608
607
// We just converted it to HTML. Make sure everything downstream knows it.
609
608
// Taking this HTML and feeding it into the Rich Format for example, would be invalid.
610
609
$ data ['Format ' ] = 'Html ' ;
@@ -660,7 +659,7 @@ public function commentModel_beforeRecordAdvancedNotification($sender, $args){
660
659
// $data["HeadlineFormat"] = 'The new discussion has been posted in the category ' . $categoryName . '.';
661
660
// Format to Html
662
661
$ discussionStory = condense (Gdn_Format::to ($ discussion ['Body ' ], $ discussion ['Format ' ]));
663
- $ commentStory = Gdn::formatService ()->renderHTML ($ comment ['Body ' ],$ comment ['Format ' ]);
662
+ $ commentStory = Gdn::formatService ()->renderQuote ($ comment ['Body ' ],$ comment ['Format ' ]);
664
663
// We just converted it to HTML. Make sure everything downstream knows it.
665
664
// Taking this HTML and feeding it into the required format for example, would be invalid.
666
665
$ data ['Format ' ] = 'Html ' ;
0 commit comments