Merge branch 'development' of goeranh/fitness-api into master

This commit is contained in:
Göran Heinemann 2020-03-31 11:14:04 +02:00 committed by Gitea
commit 5beedc7a38

View File

@ -11,7 +11,7 @@ if (isset($_GET['token'])){
$userData = $stmt->fetchAll(PDO::FETCH_ASSOC); $userData = $stmt->fetchAll(PDO::FETCH_ASSOC);
$username = $userData[0]['username']; $username = $userData[0]['username'];
$userID = $userData[0]['user']; $userID = $userData[0]['user'];
$sql = "SELECT * FROM workout_routines inner join users on workout_routines.creator=users.id WHERE public=1 or creator=?"; $sql = "SELECT workout_routines.id, title, username FROM workout_routines inner join users on workout_routines.creator=users.id WHERE public=1 or creator=?";
$stmt = $pdo->prepare($sql); $stmt = $pdo->prepare($sql);
$stmt->bindParam(1, $userID); $stmt->bindParam(1, $userID);
if ($stmt->execute()){ if ($stmt->execute()){