Merge remote-tracking branch 'upstream/dev' into wiki

1 files changed, 0 insertions, 37 deletions

diff --git a/include/notify.php b/include/notify.php
deleted file mode 100644
index 2b032b56b..000000000
--- a/include/notify.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php /** @file */
-
-
-function format_notification($item) {
-
-	$ret = '';
-
-	require_once('include/conversation.php');
-
-	// Call localize_item with the "brief" flag to get a one line status for activities. 
-	// This should set $item['localized'] to indicate we have a brief summary.
-
-	localize_item($item);
-
-	if($item_localize) {
-		$itemem_text = $item['localize'];
-	}
-	else {
-		$itemem_text = (($item['item_thread_top'])
-			? t('created a new post')
-			: sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name']));
-	}
-
-	// convert this logic into a json array just like the system notifications
-
-	return array(
-		'notify_link' => $item['llink'], 
-		'name' => $item['author']['xchan_name'],
-		'url' => $item['author']['xchan_url'],
-		'photo' => $item['author']['xchan_photo_s'],
-		'when' => relative_date($item['created']), 
-		'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), 
-		'message' => strip_tags(bbcode($itemem_text))
-	);
-
-}
-