One more place we need ids instead of names.

Add a utility function to act as callback to array_map, still need
to audit code for all places to use it.

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 1fff82b..953f488 100644 (file)
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -52,6 +52,11 @@ class Ansel
         return $mdb;
     }
 
+    static public function keysFromNames($gallery)
+    {
+        return $gallery->getId();
+    }
+
     /**
      * Return a string containing an <option> listing of the given
      * gallery array.

diff --git a/ansel/lib/Storage.php b/ansel/lib/Storage.php
index 574fde1..093da9a 100644 (file)
--- a/ansel/lib/Storage.php
+++ b/ansel/lib/Storage.php
@@ -1012,8 +1012,8 @@ class Ansel_Storage
         if (empty($galleries)) {
             return array();
         }
-
-        $where = 'gallery_id IN(' . implode(',', array_keys($galleries)) . ') AND LENGTH(image_latitude) > 0 GROUP BY image_latitude, image_longitude';
+        $ids = array_map(array('Ansel', 'keysFromNames'), $galleries);
+        $where = 'gallery_id IN(' . implode(',', $ids) . ') AND LENGTH(image_latitude) > 0 GROUP BY image_latitude, image_longitude';
         return $this->listImages(0, $start, $count, array('image_id as id', 'image_id', 'gallery_id', 'image_latitude', 'image_longitude', 'image_location'), $where, 'image_geotag_date DESC');
     }