1 files changed, 12 insertions, 12 deletions

diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 99384af621a..1b4f908773e 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -23,14 +23,14 @@
 
 class OC_Gallery_Photo {
 	public static function create($albumId, $img){
-		$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
+		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*gallery_photos` (`album_id`, `file_path`) VALUES (?, ?)');
 		$stmt->execute(array($albumId, $img));
 	}
 	public static function find($albumId, $img=null){
-		$sql = 'SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?';
+		$sql = 'SELECT * FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?';
 		$args = array($albumId);
 		if (!is_null($img)){
-			$sql .= ' AND file_path = ?';
+			$sql .= ' AND `file_path` = ?';
 			$args[] = $img;
 		}
 		$stmt = OCP\DB::prepare($sql);
@@ -38,31 +38,31 @@ class OC_Gallery_Photo {
 	}
 	public static function findForAlbum($owner, $album_name){
 		$stmt = OCP\DB::prepare('SELECT *'
-			.' FROM *PREFIX*gallery_photos photos,'
-				.' *PREFIX*gallery_albums albums'
-			.' WHERE albums.uid_owner = ?'
-				.' AND albums.album_name = ?'
-				.' AND photos.album_id = albums.album_id');
+			.' FROM `*PREFIX*gallery_photos photos`,'
+				.' `*PREFIX*gallery_albums albums`'
+			.' WHERE `albums`.`uid_owner` = ?'
+				.' AND `albums`.`album_name` = ?'
+				.' AND `photos`.`album_id` = `albums`.`album_id`');
 		return $stmt->execute(array($owner, $album_name));
 	}
 
   public static function removeByPath($path, $album_id) {
-    $stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path LIKE ? and album_id = ?');
+    $stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `file_path` LIKE ? AND `album_id` = ?');
 		$stmt->execute(array($path, $album_id));
 	}
 
 	public static function removeById($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE photo_id = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `photo_id` = ?');
 		$stmt->execute(array($id));
 	}
 
 	public static function removeByAlbumId($albumid) {
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE album_id = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?');
 		$stmt->execute(array($albumid));
 	}
 
 	public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
-		$stmt = OCP\DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
+		$stmt = OCP\DB::prepare("UPDATE `*PREFIX*gallery_photos` SET `file_path` = ?, `album_id` = ? WHERE `album_id` = ? AND `file_path` = ?");
 		$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
 	}