Merge remote-tracking branch 'upstream/master'

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index eebfe98301cc16d2ffc100bbbc0869e358d71167..0a285a6a78b69ab7b5b9f16c8493a7f1c22718bb 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -452,11 +452,13 @@ class PlaceLookup
                 $aPlace,
                 $aPlace['country_code']
             );
+
+            $aResults[$aPlace['place_id']] = $aPlace;
         }
 
-        Debug::printVar('Places', $aPlaces);
+        Debug::printVar('Places', $aResults);
 
-        return $aPlaces;
+        return $aResults;
     }
 
     /* returns an array which will contain the keys

diff --git a/lib/lib.php b/lib/lib.php
index c4fbca308636e60e0cd0e59a27fc63eb517b7597..fcd220667bcdede296654b8db9d80a827f9dab8e 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -55,7 +55,7 @@ function byImportance($a, $b)
     if ($a['importance'] != $b['importance'])
         return ($a['importance'] > $b['importance']?-1:1);
 
-    return ($a['foundorder'] < $b['foundorder']?-1:1);
+    return $a['foundorder'] <=> $b['foundorder'];
 }