Several more warnings ... (#5340)

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 0957d92d734fe0d284faf91812469b7af8365f84..d6b40dcc2e8e8f0dcb12c331c765174cf227f0f1 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -643,13 +643,20 @@ function logger($msg, $level = 0) {
        }
 
        $callers = debug_backtrace();
+
+       if (count($callers) > 1) {
+               $function = $callers[1]['function'];
+       } else {
+               $function = '';
+       }
+
        $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
                        DateTimeFormat::utcNow(DateTimeFormat::ATOM),
                        $process_id,
                        $LOGGER_LEVELS[$level],
                        basename($callers[0]['file']),
                        $callers[0]['line'],
-                       $callers[1]['function'],
+                       $function,
                        $msg
                );
 
@@ -1280,7 +1287,8 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
                                ]);
                        }
 
-                       $id = end(explode('/', $the_url));
+                       $url_parts = explode('/', $the_url);
+                       $id = end($url_parts);
                        $as .= replace_macros(get_markup_template('video_top.tpl'), [
                                '$video' => [
                                        'id'     => $id,
@@ -1710,11 +1718,11 @@ function reltoabs($text, $base) {
  * @return string
  */
 function item_post_type($item) {
-       if (intval($item['event-id'])) {
+       if (!empty($item['event-id'])) {
                return L10n::t('event');
-       } elseif (strlen($item['resource-id'])) {
+       } elseif (!empty($item['resource-id'])) {
                return L10n::t('photo');
-       } elseif (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
+       } elseif (!empty($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
                return L10n::t('activity');
        } elseif ($item['id'] != $item['parent']) {
                return L10n::t('comment');