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

- Added constant DOC_ROOT in system.config-default.inc.php

Browse Source 
- Using DOC_ROOT in dbupdate_3.2.php to be compatible with checksystem.php and DBTools.php
- Rolled back all classes in the include directory from CI to basis_db
This commit is contained in:
bison
2016-08-17 11:14:52 +02:00
parent dd6ef9fdb1
commit cf999b6d82
17 changed files with 308 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dms.class.php
+11 -17
View File
@@ -24,16 +24,8 @@
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/content/Dms_model.php');
class dms extends Dms_model
class dms extends basis_db
{
use db_extra; //CI Hack
public $new;
public $result=array();
@@ -71,18 +63,20 @@ class dms extends Dms_model
* @param dms_id
* @param version optional
*/
public function load($dms_id = null, $version=null)
public function load($dms_id, $version = null)
{
$qry = "SELECT tbl_dms.dms_id, * FROM campus.tbl_dms JOIN campus.tbl_dms_version USING(dms_id) WHERE dms_id=".$this->db_add_param($dms_id, FHC_INTEGER);
$qry = "SELECT tbl_dms.dms_id, *
FROM campus.tbl_dms JOIN campus.tbl_dms_version USING(dms_id)
WHERE dms_id = " . $this->db_add_param($dms_id, FHC_INTEGER);
if(!is_null($version))
$qry.=" AND version=".$this->db_add_param($version, FHC_INTEGER);
if (!is_null($version))
$qry .= " AND version=".$this->db_add_param($version, FHC_INTEGER);
$qry.=" ORDER BY version DESC LIMIT 1;";
$qry .= " ORDER BY version DESC LIMIT 1;";
if($result = $this->db_query($qry))
if ($result = $this->db_query($qry))
{
if($row = $this->db_fetch_object($result))
if ($row = $this->db_fetch_object($result))
{
$this->dms_id = $row->dms_id;
$this->version = $row->version;
@@ -1396,4 +1390,4 @@ class dms extends Dms_model
}
}
}
?>
?>