Skip to content

Commit 4414893

Browse files
jgg9026jgg9026
committed
Merge remote-tracking branch 'origin/release/3.11+5' into release/4.0
2 parents ba0b3d4 + a50c508 commit 4414893

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

‎classes/controller/edit_controller.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ public function reply_action() {
114114
if (!empty($privatereply)) {
115115
$privatereply = $parent->userid;
116116
}
117+
// Convert text to HTML format.
118+
$message = format_text($message, FORMAT_MOODLE, ['filter' => false]);
119+
117120
$data = array(
118121
'privatereply' => $privatereply,
119122
'message' => $message,

‎tests/behat/posts_ordering_general.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Feature: New Open discussions and discussions with recently added replies are di
6363
And I am on the "Course general forum" "hsuforum activity" page
6464
And I follow "Forum post 1"
6565
And I follow "Use advanced editor and additional options"
66-
And I set the field with xpath "//*[@id='id_messageeditable']" to "Reply to the first post"
66+
And I set the field with xpath "//*[@id='id_message']" to "Reply to the first post"
6767
And I press "Post to forum"
6868
And I wait to be redirected
6969
And I am on "Course 1" course homepage

‎yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article-debug.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -580,10 +580,10 @@ Y.extend(FORM, Y.Base,
580580
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
581581
advNode.setAttribute('href', advNode.getAttribute('href')
582582
.replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
583-
var message = wrapperNode.one('div[id^=editor-target-container-]');
583+
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
584584
advNode.on("click", function (e) {
585585
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
586-
message.get('textContent'));
586+
message.get('value'));
587587
});
588588

589589
if (parentNode.hasAttribute('data-ispost')) {
@@ -758,12 +758,12 @@ Y.extend(FORM, Y.Base,
758758
},
759759

760760
sendInProgressData:function (e) {
761-
var message = Y.one('div[id^=editor-target-container-]');
761+
var message = Y.one('div[id^=editor-target-container-] textarea');
762762
var subject = Y.one('input[name=subject]');
763763
var link = e.target.getAttribute('href');
764764
if (!link.includes('post.php?edit')) {
765765
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
766-
message.get('textContent') + '&subcontent=' + subject.get('value'));
766+
message.get('value') + '&subcontent=' + subject.get('value'));
767767
}
768768
},
769769
/**
@@ -961,11 +961,11 @@ Y.extend(FORM, Y.Base,
961961
Y.log('Timed post disabled');
962962
}
963963
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
964-
var message = Y.one('div[id^=editor-target-container-]');
964+
var message = Y.one('div[id^=editor-target-container-] textarea');
965965
var subject = Y.one('input[name=subject]');
966966
advNode.on("click", function (e) {
967967
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
968-
message.get('textContent') + '&subcontent=' + subject.get('value'));
968+
message.get('value') + '&subcontent=' + subject.get('value'));
969969
});
970970

971971
},

‎yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article-min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,10 @@ Y.extend(FORM, Y.Base,
579579
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
580580
advNode.setAttribute('href', advNode.getAttribute('href')
581581
.replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
582-
var message = wrapperNode.one('div[id^=editor-target-container-]');
582+
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
583583
advNode.on("click", function (e) {
584584
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
585-
message.get('textContent'));
585+
message.get('value'));
586586
});
587587

588588
if (parentNode.hasAttribute('data-ispost')) {
@@ -752,12 +752,12 @@ Y.extend(FORM, Y.Base,
752752
},
753753

754754
sendInProgressData:function (e) {
755-
var message = Y.one('div[id^=editor-target-container-]');
755+
var message = Y.one('div[id^=editor-target-container-] textarea');
756756
var subject = Y.one('input[name=subject]');
757757
var link = e.target.getAttribute('href');
758758
if (!link.includes('post.php?edit')) {
759759
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
760-
message.get('textContent') + '&subcontent=' + subject.get('value'));
760+
message.get('value') + '&subcontent=' + subject.get('value'));
761761
}
762762
},
763763
/**
@@ -952,11 +952,11 @@ Y.extend(FORM, Y.Base,
952952
catch(err) {
953953
}
954954
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
955-
var message = Y.one('div[id^=editor-target-container-]');
955+
var message = Y.one('div[id^=editor-target-container-] textarea');
956956
var subject = Y.one('input[name=subject]');
957957
advNode.on("click", function (e) {
958958
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
959-
message.get('textContent') + '&subcontent=' + subject.get('value'));
959+
message.get('value') + '&subcontent=' + subject.get('value'));
960960
});
961961

962962
},

‎yui/src/article/js/form.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ Y.extend(FORM, Y.Base,
7878
var advNode = wrapperNode.one(SELECTORS.FORM_ADVANCED);
7979
advNode.setAttribute('href', advNode.getAttribute('href')
8080
.replace(/reply=\d+/, 'reply=' + parentNode.getData('postid')));
81-
var message = wrapperNode.one('div[id^=editor-target-container-]');
81+
var message = wrapperNode.one('div[id^=editor-target-container-] textarea');
8282
advNode.on("click", function (e) {
8383
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
84-
message.get('textContent'));
84+
message.get('value'));
8585
});
8686

8787
if (parentNode.hasAttribute('data-ispost')) {
@@ -256,12 +256,12 @@ Y.extend(FORM, Y.Base,
256256
},
257257

258258
sendInProgressData:function (e) {
259-
var message = Y.one('div[id^=editor-target-container-]');
259+
var message = Y.one('div[id^=editor-target-container-] textarea');
260260
var subject = Y.one('input[name=subject]');
261261
var link = e.target.getAttribute('href');
262262
if (!link.includes('post.php?edit')) {
263263
e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
264-
message.get('textContent') + '&subcontent=' + subject.get('value'));
264+
message.get('value') + '&subcontent=' + subject.get('value'));
265265
}
266266
},
267267
/**
@@ -459,11 +459,11 @@ Y.extend(FORM, Y.Base,
459459
Y.log('Timed post disabled');
460460
}
461461
var advNode = Y.one(SELECTORS.FORM_ADVANCED);
462-
var message = Y.one('div[id^=editor-target-container-]');
462+
var message = Y.one('div[id^=editor-target-container-] textarea');
463463
var subject = Y.one('input[name=subject]');
464464
advNode.on("click", function (e) {
465465
advNode.setAttribute('href', advNode.getAttribute('href') + '&msgcontent=' +
466-
message.get('textContent') + '&subcontent=' + subject.get('value'));
466+
message.get('value') + '&subcontent=' + subject.get('value'));
467467
});
468468

469469
},

0 commit comments

Comments
 (0)