Mercurial > hg > mgallery
changeset 299:338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 30 Sep 2019 15:09:11 +0300 |
parents | cf166dcc6e77 |
children | 7bccb4204e6e |
files | mgtool.php |
diffstat | 1 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mgtool.php Sat Aug 03 06:18:18 2019 +0300 +++ b/mgtool.php Mon Sep 30 15:09:11 2019 +0300 @@ -658,18 +658,24 @@ function mgSortFunc($a, $b) { - if (isset($a["datetime"]) && isset($b["datetime"])) - { - if (is_object($a["datetime"]) && is_object($b["datetime"])) - return $b["datetime"]->getTimestamp() - $a["datetime"]->getTimestamp(); - else - return $b["datetime"] - $a["datetime"]; - } + if (isset($a["datetime"]) && is_object($a["datetime"]) && + isset($b["datetime"]) && is_object($b["datetime"])) + $cres = $b["datetime"]->getTimestamp() - $a["datetime"]->getTimestamp(); + else + if (isset($a["datetime"]) && is_object($a["datetime"]) && + isset($b["base"])) + $cres = -1; + else + if (isset($b["datetime"]) && is_object($b["datetime"]) && + isset($a["base"])) + $cres = 1; else if (isset($a["base"]) && isset($b["base"])) - return strcmp($b["base"], $a["base"]); + $cres = strcmp($b["base"], $a["base"]); else - return 0; + $cres = 0; + + return $cres; }