Merge branch 'develop' into 'master'

fixed recipe import issue

See merge request bluekay/shopping-list!18
This commit is contained in:
Tim Krehan 2019-06-03 14:05:58 +00:00
commit af6a6889a8

View file

@ -23,7 +23,7 @@
function getID($Name){ function getID($Name){
include $_SESSION["docroot"].'/php/connect.php'; include $_SESSION["docroot"].'/php/connect.php';
$selectQuery = $mysqli->prepare("SELECT `ID` FROM `Einheit` WHERE `Name` = ?;"); $selectQuery = $mysqli->prepare("SELECT `ID` FROM `Einheit` WHERE `Name` = ?;");
$selectQuery->bind_param("s", "$Name"); $selectQuery->bind_param("s", $Name);
$selectQuery->execute(); $selectQuery->execute();
$result = $selectQuery->get_result(); $result = $selectQuery->get_result();
$ID = $result->fetch_assoc(); $ID = $result->fetch_assoc();