Merge branch 'staging' into fix/ide-anger

Br3nda · web-flow · commit ff4eab6568eb · 2026-04-05T13:34:06.000+12:00
diff --git a/www/docs/api/api_getConstituencies.php b/www/docs/api/api_getConstituencies.php
@@ -147,10 +147,9 @@ function _api_getConstituencies_latitude($lat, $lon, $d) {
             );
         }
     }
-    usort($out, create_function('$a,$b', "
-		if (\$a['distance'] > \$b['distance']) return 1;
-		if (\$a['distance'] < \$b['distance']) return -1;
-		return 0;"));
+    usort($out, function ($a, $b) {
+        return $a['distance'] <=> $b['distance'];
+    });
     return $out;
 }
 
diff --git a/www/docs/api/index.php b/www/docs/api/index.php
@@ -63,7 +63,7 @@
         api_log_call($key);
         api_front_page('Unknown function "' . htmlspecialchars($q_method) .
             '". Possible functions are: ' .
-           implodeoin(', ', array_keys($methods)));
+           implode(', ', array_keys($methods)));
     }
     else {
         if (get_http_var('docs')) {

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,9 @@ function _api_getConstituencies_latitude($lat, $lon, $d) {`
`147`	`147`	`);`
`148`	`148`	`}`
`149`	`149`	`}`
`150`		`- usort($out, create_function('$a,$b', "`
`151`		`- if (\$a['distance'] > \$b['distance']) return 1;`
`152`		`- if (\$a['distance'] < \$b['distance']) return -1;`
`153`		`- return 0;"));`
	`150`	`+ usort($out, function ($a, $b) {`
	`151`	`+ return $a['distance'] <=> $b['distance'];`
	`152`	`+ });`
`154`	`153`	`return $out;`
`155`	`154`	`}`
`156`	`155`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`api_log_call($key);`
`64`	`64`	`api_front_page('Unknown function "' . htmlspecialchars($q_method) .`
`65`	`65`	`'". Possible functions are: ' .`
`66`		`- implodeoin(', ', array_keys($methods)));`
	`66`	`+ implode(', ', array_keys($methods)));`
`67`	`67`	`}`
`68`	`68`	`else {`
`69`	`69`	`if (get_http_var('docs')) {`