blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-10 08:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHP Version compatibility Fixes

Browse Source
This commit is contained in:
Andreas Österreicher
2018-06-26 13:42:54 +02:00
parent c26289cff6
commit bd0979a096
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/jobs/AmpelMail.php
+5 -6
View File
@@ -16,10 +16,7 @@ if (! defined('BASEPATH'))
class AmpelMail extends FHC_Controller
{
const CIS_AMPELVERWALTUNG_URL =
CIS_ROOT. "cis/index.php?menu=".
CIS_ROOT. "cis/menu.php?content_id=&content=".
CIS_ROOT. "cis/private/tools/ampelverwaltung.php";
private $CIS_AMPELVERWALTUNG_URL;
/**
* Constructor
@@ -39,7 +36,9 @@ class AmpelMail extends FHC_Controller
echo "Jobs must be run from the CLI";
exit;
}
$this->CIS_AMPELVERWALTUNG_URL = CIS_ROOT. "cis/index.php?menu=".
CIS_ROOT. "cis/menu.php?content_id=&content=".
CIS_ROOT. "cis/private/tools/ampelverwaltung.php";
// Load models
$this->load->model('content/Ampel_model', 'AmpelModel');
$this->load->model('person/Person_model', 'PersonModel');
@@ -206,7 +205,7 @@ class AmpelMail extends FHC_Controller
'uid' => $uid,
'firstName' => $firstName,
'ampel_list' => $html_text,
'link' => self::CIS_AMPELVERWALTUNG_URL
'link' => $this->CIS_AMPELVERWALTUNG_URL
);
}
return $ampel_data_arr;
application/models/content/Ampel_model.php
+2 -1
View File
@@ -50,7 +50,8 @@ class Ampel_model extends DB_Model
*/
public function execBenutzerSelect($benutzer_select)
{
if (isset($benutzer_select) && !empty(trim($benutzer_select)))
$trimed = trim($benutzer_select);
if (isset($benutzer_select) && !empty($trimed))
{
return $this->execQuery($benutzer_select);
}