X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=f22c1cf5b1d11342b5c92b861ed7714397e40186;hb=0448ca38973fed14840d33079989fd71af93708b;hp=8ae925a0653cd8eee0b14381335b113075350836;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index 8ae925a065..f22c1cf5b1 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -2,12 +2,16 @@
 /**
  * @file mod/notify.php
  */
+
 use Friendica\App;
-use Friendica\Core\NotificationsManager;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
+use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use Friendica\Module\Login;
+use Friendica\Util\Temporal;
 
 function notify_init(App $a)
 {
@@ -27,7 +31,7 @@ function notify_init(App $a)
 				require_once("include/items.php");
 				$urldata = parse_url($note['link']);
 				$guid = basename($urldata["path"]);
-				$itemdata = get_item_id($guid, local_user());
+				$itemdata = Item::getIdAndNickByGuid($guid, local_user());
 				if ($itemdata["id"] != 0) {
 					$note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
 				}
@@ -58,7 +62,6 @@ function notify_content(App $a)
 	$notif_tpl = get_markup_template('notifications.tpl');
 
 	$not_tpl = get_markup_template('notify.tpl');
-	require_once('include/bbcode.php');
 
 	$r = $nm->getAll(['seen'=>0]);
 	if (DBM::is_result($r) > 0) {
@@ -66,15 +69,15 @@ function notify_content(App $a)
 			$notif_content .= replace_macros($not_tpl, [
 				'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
 				'$item_image' => $it['photo'],
-				'$item_text' => strip_tags(bbcode($it['msg'])),
-				'$item_when' => relative_date($it['date'])
+				'$item_text' => strip_tags(BBCode::convert($it['msg'])),
+				'$item_when' => Temporal::getRelativeDate($it['date'])
 			]);
 		}
 	} else {
 		$notif_content .= L10n::t('No more system notifications.');
 	}
 
-	$o .= replace_macros($notif_tpl, [
+	$o = replace_macros($notif_tpl, [
 		'$notif_header' => L10n::t('System Notifications'),
 		'$tabs' => false, // $tabs,
 		'$notif_content' => $notif_content,