blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-16354/TinyMCE_move_to_new_version' into infocenter_2023_12_04

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
ma0048
2023-12-04 12:44:10 +01:00
parent a4417bdd98 91f3197c24
commit ab5d0693eb
25 changed files with 411 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/messages/FASMessages.php
+2 -2
View File
@@ -37,7 +37,7 @@ class FASMessages extends Auth_Controller
// Loads the view to write a new message with a template
$this->load->view(
'system/messages/htmlWriteTemplate',
'system/messages/FAShtmlWriteTemplate',
$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents)
);
}
@@ -53,7 +53,7 @@ class FASMessages extends Auth_Controller
// Loads the view to write a new message with a template
$this->load->view(
'system/messages/htmlWriteTemplate',
'system/messages/FAShtmlWriteTemplate',
$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents, $message_id, $recipient_id)
);
}