diff options
| author | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-21 15:20:59 -0800 |
|---|---|---|
| committer | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-21 15:20:59 -0800 |
| commit | b513662b52576a5507d2280efd684e13ffd31fb5 (patch) | |
| tree | ddf6bb88e5228e2fc553e0e3b08b5540e86d3e10 /Zotlabs | |
| parent | 88caa14030f29c59424beb0237ea10526565b4e6 (diff) | |
| download | volse-hubzilla-b513662b52576a5507d2280efd684e13ffd31fb5.tar.gz volse-hubzilla-b513662b52576a5507d2280efd684e13ffd31fb5.tar.bz2 volse-hubzilla-b513662b52576a5507d2280efd684e13ffd31fb5.zip | |
remove the channel introduction on the system notifications page. "Hubzilla, George commented on your status 20 minutes ago". We need the channel introduction (in this case "Hubzilla," in emails for situations where one person controls a lot of channels. We don't need it on the web notification summary; where you're only viewing notifications for a single given channel.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Notifications.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 31a893133..c3380939a 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -2,8 +2,6 @@ namespace Zotlabs\Lib; -use \Zotlabs\Storage\GitRepo as GitRepo; - define ( 'NWIKI_ITEM_RESOURCE_TYPE', 'nwiki' ); class NativeWiki { diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php index 2db02c758..e0313dd8b 100644 --- a/Zotlabs/Module/Notifications.php +++ b/Zotlabs/Module/Notifications.php @@ -23,10 +23,13 @@ class Notifications extends \Zotlabs\Web\Controller { if($r) { $notifications_available = 1; foreach ($r as $it) { + $x = strip_tags(bbcode($it['msg'])); + if(strpos($x,',')) + $x = substr($x,strpos($x,',')+1); $notif_content .= replace_macros(get_markup_template('notify.tpl'),array( '$item_link' => z_root().'/notify/view/'. $it['id'], '$item_image' => $it['photo'], - '$item_text' => strip_tags(bbcode($it['msg'])), + '$item_text' => $x, '$item_when' => relative_date($it['created']) )); } |