From: Andreas Unterkircher <unki@netshadow.at>
Date: Sat, 7 Jun 2008 15:25:41 +0000 (+0200)
Subject: Merge branch 'issue124'
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=3d5877ab7f5b9cf885b74bbb881115050f8d5ed8;hp=2f28815e3e4924839670dd34e2b4027c60b5bb34

Merge branch 'issue124'
---

diff --git a/CHANGELOG b/CHANGELOG
index 12cd368..ca0bb1a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+phpfspot (1.6)
+
+ * bug, sort-by rates if all photos of the library are displayed works now.
+ * bug, phpfspot used the image files last modification date instead of F-Spot's
+   recorded date when no EXIF data were available. Now it displays the same time as
+   F-Spot does.
+ * feature, date-input appears now as one field instead of seperates for year, month
+   and day.
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Sat, 25 May 2008 11:00:00 +0100
+
 phpfspot (1.5)
 
   * feature, user-friendly URL's (with Apache's mod_rewrite).
diff --git a/README b/README
index d00991e..48f9ae5 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Package Name: phpfspot
-Version:      1.5
+Version:      1.6
 Author:       Andreas Unterkircher <unki@netshadow.at>
 Website:      http://oss.netshadow.at
 Desc:         dynamic PHP gallery for F-Spot
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 2b5e180..ae58790 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -122,7 +122,7 @@ class PHPFSPOT {
 
       /* set application name and version information */
       $this->cfg->product = "phpfspot";
-      $this->cfg->version = "1.5";
+      $this->cfg->version = "1.6";
 
       $this->sort_orders= array(
          'date_asc' => 'Date &uarr;',
@@ -2722,10 +2722,10 @@ class PHPFSPOT {
             return " ORDER BY t.name DESC ,p.time ASC";
             break;
          case 'rate_asc':
-            return " ORDER BY t.name ASC, p.rating ASC";
+            return " ORDER BY p.rating ASC, t.name ASC";
             break;
          case 'rate_desc':
-            return " ORDER BY t.name DESC, p.rating DESC";
+            return " ORDER BY p.rating DESC, t.name DESC";
             break;
       }