issue85, fix SQL error when trying to sort photos by name on newer F-Spot database...

diff --git a/phpfspot.class.php b/phpfspot.class.php
index b61f5161a68d0ed5b81242d2850c0ad887680cb5..b3ad278458a350089ae2ea5ac6e09107e1d9be0b 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -1951,10 +1951,20 @@ class PHPFSPOT {
             return " ORDER BY p.time DESC";
             break;
          case 'name_asc':
             return " ORDER BY p.time DESC";
             break;
          case 'name_asc':

-            return " ORDER BY p.name ASC";
+            if($this->dbver < 9) {
+               return " ORDER BY p.name ASC";
+            }
+            else {
+               return " ORDER BY p.uri ASC";
+            }

             break;
          case 'name_desc':
             break;
          case 'name_desc':

-            return " ORDER BY p.name DESC";
+            if($this->dbver < 9) {
+               return " ORDER BY p.name DESC";
+            }
+            else {
+               return " ORDER BY p.uri DESC";
+            }

             break;
       }
 
             break;
       }