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

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
This commit is contained in:
paolo
2016-04-20 17:57:55 +02:00
parent 0ffe7fbcc6
commit 78e4c2900b
23 changed files with 914 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/person.class.php
+2 -9
View File
@@ -22,7 +22,6 @@
/*
* Benoetigt functions.inc.php
*/
//require_once(dirname(__FILE__).'/basis_db.class.php'); Now over CI
require_once(dirname(__FILE__).'/datum.class.php');
// CI
@@ -93,12 +92,7 @@ class person extends Person_model
//person_id auf gueltigkeit pruefen
if (is_numeric($personId) && $personId != '')
{
/* Alter Code
$qry = "SELECT person_id, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen,
gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen,
familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre, matr_nr
FROM public.tbl_person WHERE person_id=".$this->db_add_param($personId, FHC_INTEGER);
$qry = str_replace('?', $this->db_add_param($personId, FHC_INTEGER), $this->_loadQuery);
if (!$this->db_query($qry))
{
@@ -106,8 +100,7 @@ class person extends Person_model
return false;
}
if ($row = $this->db_fetch_object())*/
if ($row = $this->getPerson($personId))
if ($row = $this->db_fetch_object())
{
$this->person_id = $row->person_id;
$this->sprache = $row->sprache;