diff options
| author | M. Dent <dentm42@gmail.com> | 2019-12-04 03:44:25 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-12-04 03:44:25 +0100 |
| commit | b48a9d3f7511bcb7a1b5d5dcec06f170b0f6ac9d (patch) | |
| tree | 2c18404f4315d46c8d01fd0f8899062a4f9e50d6 /Zotlabs/Module/Channel.php | |
| parent | c1aa96ebf70fd5b6426d96bf7d7e771dfc4ca9ab (diff) | |
| parent | 21b398252aaf28d9ff8045fbe3e9fcb162a6f447 (diff) | |
| download | volse-hubzilla-b48a9d3f7511bcb7a1b5d5dcec06f170b0f6ac9d.tar.gz volse-hubzilla-b48a9d3f7511bcb7a1b5d5dcec06f170b0f6ac9d.tar.bz2 volse-hubzilla-b48a9d3f7511bcb7a1b5d5dcec06f170b0f6ac9d.zip | |
Merge branch 'dev' into 'dev'
Add content pinning support
See merge request hubzilla/core!1794
Diffstat (limited to 'Zotlabs/Module/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index d975ac1bf..20a5418c2 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -468,6 +468,13 @@ class Channel extends Controller { ); } } + + // Add pinned content + if(! $decoded && ! $search) { + $pinned = new \Zotlabs\Widget\Pinned; + $r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]); + $o .= $r['html']; + } $mode = (($search) ? 'search' : 'channel'); |