Skip to content

Fix for #15: Fixed bug for editSong throwing error when song_id doesn't exist #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
panique merged 3 commits into from
Mar 29, 2018
Merged

Fix for #15: Fixed bug for editSong throwing error when song_id doesn't exist #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ec4888
Added row count checking on getSong to return false if there are no rows
mhco Mar 29, 2018
766751d
Load error page if editsong $song_id doesn't exist in db
mhco Mar 29, 2018
7faa39e
Cleaned up the braces, and changed the conditional
mhco Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions application/Controller/SongsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,16 @@ public function editSong($song_id)
// do getSong() in model/model.php
$song = $Song->getSong($song_id);

// in a real application we would also check if this db entry exists and therefore show the result or
// redirect the user to an error page or similar

// load views. within the views we can echo out $song easily
require APP . 'view/_templates/header.php';
require APP . 'view/songs/edit.php';
require APP . 'view/_templates/footer.php';
// If the song wasn't found, then it would have returned false, and we need to display the error page
if ($song === false) {
$page = new \Mini\Controller\ErrorController();
$page->index();
} else {
// load views. within the views we can echo out $song easily
require APP . 'view/_templates/header.php';
require APP . 'view/songs/edit.php';
require APP . 'view/_templates/footer.php';
}
} else {
// redirect user to songs index page (as we don't have a song_id)
header('location: ' . URL . 'songs/index');
Expand Down
2 changes: 1 addition & 1 deletion application/Model/Song.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function getSong($song_id)
$query->execute($parameters);

// fetch() is the PDO method that get exactly one result
return $query->fetch();
return ($query->rowcount() ? $query->fetch() : false);
}

/**
Expand Down