coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

correctly use Seminary information for retrieving media

Browse source
This commit is contained in:
oliver 2015-04-08 11:20:54 +02:00
commit a715e8ae1e
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/MediaController.inc
View file

@ -425,7 +425,7 @@
// Set filename // Set filename
$media['filename'] = ROOT.DS.\nre\configs\AppConfig::$dirs['seminarymedia'].DS.$media['id']; $media['filename'] = ROOT.DS.\nre\configs\AppConfig::$dirs['seminarymedia'].DS.$media['id'];
if(!file_exists($media['filename'])) { if(!file_exists($media['filename'])) {
throw new \nre\exceptions\IdNotFoundException($media['url']); throw new \nre\exceptions\IdNotFoundException($media['id'].': '.$media['url']);
} }
// Cache // Cache

7
models/MediaModel.inc
View file

@ -97,12 +97,13 @@
$data = $this->db->query( $data = $this->db->query(
'SELECT id, name, url, description, mimetype '. 'SELECT id, name, url, description, mimetype '.
'FROM seminarymedia '. 'FROM seminarymedia '.
'WHERE url = ?', 'WHERE seminary_id = ? AND url = ?',
's', 'is',
$seminaryId,
$seminaryMediaUrl $seminaryMediaUrl
); );
if(empty($data)) { if(empty($data)) {
throw new \nre\exceptions\IdNotFoundException($seminaryMediaUrl); throw new \nre\exceptions\IdNotFoundException($seminaryId.': '.$seminaryMediaUrl);
} }