Browse Source

Continued:

- used x() to make sure the array key is there, else an E_NOTICE is triggered
- added type-hints where it is safe

Signed-off-by: Roland Häder <roland@mxchange.org>
pull/5042/head
Roland Häder 3 years ago
parent
commit
e0a07d5f27
No known key found for this signature in database GPG Key ID: B72F8185C6C7BD78
  1. 4
      include/api.php
  2. 6
      include/conversation.php

4
include/api.php

@ -935,7 +935,7 @@ function api_reformat_xml(&$item, &$key)
*
* @return string The XML data
*/
function api_create_xml($data, $root_element)
function api_create_xml(array $data, $root_element)
{
$childname = key($data);
$data2 = array_pop($data);
@ -960,7 +960,7 @@ function api_create_xml($data, $root_element)
$i = 1;
foreach ($data2 as $item) {
$data4[$i++.":".$childname] = $item;
$data4[$i++ . ":" . $childname] = $item;
}
$data2 = $data4;

6
include/conversation.php

@ -1609,16 +1609,16 @@ function sort_thr_commented(array $a, array $b)
}
function render_location_dummy(array $item) {
if ($item['location'] != "") {
if (x($item, 'location') && !empty($item['location'])) {
return $item['location'];
}
if ($item['coord'] != "") {
if (x($item, 'coord') && !empty($item['coord'])) {
return $item['coord'];
}
}
function get_responses(array $conv_responses, array $response_verbs, $ob, $item) {
function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
$ret = [];
foreach ($response_verbs as $v) {
$ret[$v] = [];

Loading…
Cancel
Save