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

Merge branch 'master' into cleanci

Browse Source
This commit is contained in:
Paolo
2019-04-30 13:14:37 +02:00
parent e1ed8b55f5 3b4012798f
commit d4c7f1f18d
33 changed files with 1196 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/person/Person_model.php
+1 -1
View File
@@ -200,7 +200,7 @@ class Person_model extends DB_Model
}
/**
* Retrives the language of the user by the UID
* Retrieves the language of the user by the UID
* Gets all the persons related to the given UID and starting from the most recent person in DB
* tries to find a valid language (!= null), if found is returned, otherwise is returned the
* default global language of the system
application/models/system/Phrase_model.php
+1 -1
View File
@@ -57,7 +57,7 @@ class Phrase_model extends DB_Model
/**
* Loads phrases using category(s) and language as keys
* The retrived fields are category, phrase, orgeinheit_kurzbz, orgform_kurzbz and text
* The retrieved fields are category, phrase, orgeinheit_kurzbz, orgform_kurzbz and text
* They are ordered by p.category, p.phrase, pt.orgeinheit_kurzbz DESC and pt.orgform_kurzbz DESC'
*/
public function getPhrasesByCategoryAndLanguage($categories, $language)