Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

This commit is contained in:
Shish 2015-10-19 07:11:47 +01:00
commit 0855c7e9c4

View file

@ -276,8 +276,7 @@ class Notes extends Extension {
(?, ?, ?, ?, now(), ?, ?, ?, ?, ?)",
array(1, $imageID, $user_id, $_SERVER['REMOTE_ADDR'], $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText));
$result = $database->get_row("SELECT LAST_INSERT_ID() AS noteID", array());
$noteID = $result["noteID"];
$noteID = $database->get_last_insert_id('notes_id_seq');
log_info("notes", "Note added {$noteID} by {$user->name}");
@ -304,9 +303,9 @@ class Notes extends Extension {
(?, ?, now())",
array($image_id, $user_id));
$result = $database->get_row("SELECT LAST_INSERT_ID() AS requestID", array());
$resultID = $database->get_last_insert_id('note_request_id_seq');
log_info("notes", "Note requested {$result["requestID"]} by {$user->name}");
log_info("notes", "Note requested {$requestID} by {$user->name}");
}