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

Messages im FAS werden nach Datum sortiert anstatt nach Betreff

Browse Source
This commit is contained in:
Andreas Österreicher
2018-02-20 18:42:23 +01:00
parent 695e7f60af
commit 7c2445dc89
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Messages.php
+6 -6
View File
@@ -10,19 +10,19 @@ class Messages extends VileSci_Controller
*
*/
public function __construct()
{
parent::__construct();
{
parent::__construct();
// Loads the message library
$this->load->library('MessageLib');
// Loads the message library
$this->load->library('MessageLib');
// Loads the widget library
// Loads the widget library
$this->load->library('WidgetLib');
$this->load->model('person/Person_model', 'PersonModel');
$this->_setAuthUID(); // sets property uid
}
}
/**
* write
application/libraries/MessageLib.php
+2 -2
View File
@@ -746,8 +746,8 @@ class MessageLib
$this->ci->BenutzerfunktionModel->addJoin('public.tbl_benutzer', 'uid');
// Get all the valid receivers id using the oe_kurzbz
$receivers = $this->ci->BenutzerfunktionModel->loadWhere(
'oe_kurzbz = \''.$oe_kurzbz.'\''.
' AND funktion_kurzbz = \''.$this->ci->config->item('assistent_function').'\''.
'oe_kurzbz = '.$this->ci->db->escape($oe_kurzbz).
' AND funktion_kurzbz = '.$this->ci->db->escape($this->ci->config->item('assistent_function')).
' AND (NOW() BETWEEN COALESCE(datum_von, NOW()) AND COALESCE(datum_bis, NOW()))'
);