diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-04 10:11:48 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-04 10:11:48 +0100 |
| commit | 9dfb471c0bbf2978e528689f6c0885ff9abddc7d (patch) | |
| tree | 026b4eb97df9dfa0516c46c72e9b70d19e32529c /Zotlabs | |
| parent | a899ce1c22386b9ff882048cba35d46f560ee654 (diff) | |
| parent | 9abb061e7185a29cb85ebbad04deba715e1a6a06 (diff) | |
| download | volse-hubzilla-9dfb471c0bbf2978e528689f6c0885ff9abddc7d.tar.gz volse-hubzilla-9dfb471c0bbf2978e528689f6c0885ff9abddc7d.tar.bz2 volse-hubzilla-9dfb471c0bbf2978e528689f6c0885ff9abddc7d.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index e82c11a35..d5798e671 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -778,10 +778,14 @@ class Enotify { // Call localize_item to get a one line status for activities. // This should set $item['localized'] to indicate we have a brief summary. + // and perhaps $item['shortlocalized'] for an even briefer summary localize_item($item); - if($item['localize']) { + if($item['shortlocalize']) { + $itemem_text = $item['shortlocalize']; + } + elseif($item['localize']) { $itemem_text = $item['localize']; } else { diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 7bc3429b1..a572a5a42 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -56,8 +56,7 @@ class Search extends \Zotlabs\Web\Controller { $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); - if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch'))) - $o .= search($search,'search-box','/search',((local_channel()) ? true : false)); + $o .= search($search,'search-box','/search',((local_channel()) ? true : false)); if(strpos($search,'#') === 0) { $tag = true; |