fix first time image loading error

diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index f9a67b8b117b5811d2c01f226ecdb362433c29b1..9a2dbd3bae2d8e6fd4b8d97c52fdc2b7abaf23a4 100644 (file)
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -26,10 +26,8 @@ class DatabaseManager {
                if (!$image->loadFromFile($path)) {
                        return false;
                }
-               \OCP\DB::beginTransaction();
                $stmt = \OCP\DB::prepare('INSERT INTO *PREFIX*pictures_images_cache (uid_owner, path, width, height) VALUES (?, ?, ?, ?)');
                $stmt->execute(array(\OCP\USER::getUser(), $path, $image->width(), $image->height()));
-               \OCP\DB::commit();
                $ret = array('path' => $path, 'width' => $image->width(), 'height' => $image->height());
                unset($image);
                return $ret;
@@ -78,9 +76,14 @@ class ThumbnailsManager {
        
        public function getThumbnailInfo($path) {
                $arr = DatabaseManager::getInstance()->getFileData($path);
+               if (!$arr) {
+                       $thubnail = $this->getThumbnail($path);
+                       unset($thubnail);
+                       $arr = DatabaseManager::getInstance()->getFileData($path);
+               }
                $ret = array('filepath' => $arr['path'],
-                                                                'width' => $arr['width'],
-                                                                'height' => $arr['height']);
+                                        'width' => $arr['width'],
+                                        'height' => $arr['height']);
                return $ret;
        }