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

Adapted MessageLib, PhrasesLib and UDFLib to use the function getUserLanguage from language_helper

Browse Source
This commit is contained in:
Paolo
2018-07-05 12:13:02 +02:00
parent 83f262f170
commit d08eb75b5a
3 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/MessageLib.php
+4 -8
View File
@@ -268,7 +268,7 @@ class MessageLib
}
/**
* sendMessageVorlage() - sends new internal message using a template
* Sends new internal message using a template
*/
public function sendMessageVorlage($sender_id, $receiver_id, $vorlage_kurzbz, $oe_kurzbz, $data, $relationmessage_id = null, $orgform_kurzbz = null, $multiPartMime = true)
{
@@ -298,16 +298,12 @@ class MessageLib
{
$receiver_id = $receivers->retval[$i]->person_id;
// Checks if the receiver exists
$result = $this->ci->PersonModel->load($receiver_id);
if (hasData($result))
{
// Set the language with the global value
$sprache = DEFAULT_LANGUAGE;
// If the receiver has a prefered language use this
if (isset($result->retval[0]->sprache) && $result->retval[0]->sprache != '')
{
$sprache = $result->retval[0]->sprache;
}
// Retrives the language of the logged user
$sprache = getUserLanguage();
// Loads template data
$result = $this->ci->vorlagelib->loadVorlagetext($vorlage_kurzbz, $oe_kurzbz, $orgform_kurzbz, $sprache);