Some hotfixes for Oracle compatibility.

horde · May 9, 2016 · 27e116a · 27e116a
1 parent 4b41f6a
commit 27e116a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ansel/lib/Storage.php b/ansel/lib/Storage.php
@@ -492,12 +492,13 @@ public function &getImage($id)
         if (!$image) {
             throw new Horde_Exception_NotFound(_("Photo not found"));
         } else {
+            $columns = $this->_db->columns('ansel_images');
             $image['image_filename'] = Horde_String::convertCharset(
                 $image['image_filename'],
                 $GLOBALS['conf']['sql']['charset'],
                 'UTF-8');
             $image['image_caption'] = Horde_String::convertCharset(
-                $image['image_caption'],
+                $columns['image_caption']->binaryToString($image['image_caption']),
                 $GLOBALS['conf']['sql']['charset'],
                 'UTF-8');
             $this->_images[$id] = new Ansel_Image($image);
@@ -709,9 +710,10 @@ public function getImages(array $params = array())
         }
 
         $return = array();
+        $columns = $this->_db->columns('ansel_images');
         foreach ($images as $image) {
             $image['image_filename'] = Horde_String::convertCharset($image['image_filename'], $GLOBALS['conf']['sql']['charset'], 'UTF-8');
-            $image['image_caption'] = Horde_String::convertCharset($image['image_caption'], $GLOBALS['conf']['sql']['charset'], 'UTF-8');
+            $image['image_caption'] = Horde_String::convertCharset($columns['image_caption']->binaryToString($image['image_caption']), $GLOBALS['conf']['sql']['charset'], 'UTF-8');
             $return[$image['image_id']] = new Ansel_Image($image);
             $this->_images[(int)$image['image_id']] = &$return[$image['image_id']];
         }
@@ -813,10 +815,10 @@ public function getRecentImages(array $galleries = array(), $limit = 10, array $
         } catch (Horde_Db_Exception $e) {
             throw new Ansel_Exception($e);
         }
-
+        $columns = $this->_db->columns('ansel_images');
         foreach($images as $image) {
             $image['image_filename'] = Horde_String::convertCharset($image['image_filename'], $GLOBALS['conf']['sql']['charset'], 'UTF-8');
-            $image['image_caption'] = Horde_String::convertCharset($image['image_caption'], $GLOBALS['conf']['sql']['charset'], 'UTF-8');
+            $image['image_caption'] = Horde_String::convertCharset($columns['image_caption']->binaryToString($image['image_caption']), $GLOBALS['conf']['sql']['charset'], 'UTF-8');
             $results[] = new Ansel_Image($image);
         }