aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-12-08 00:22:46 +0100
committerMax Kostikov <max@kostikov.co>2019-12-08 00:22:46 +0100
commit258a4e5627caf8fd1b3d89596fada2bea1490c7a (patch)
tree95a5280c4bdc6e28945948c32145bba2ca49787a
parent593688d5390417564f393dd326bbcc5dd0bf8d16 (diff)
parente1400e5745d154b365aeab11b971a6c7d201f3a9 (diff)
downloadvolse-hubzilla-258a4e5627caf8fd1b3d89596fada2bea1490c7a.tar.gz
volse-hubzilla-258a4e5627caf8fd1b3d89596fada2bea1490c7a.tar.bz2
volse-hubzilla-258a4e5627caf8fd1b3d89596fada2bea1490c7a.zip
Merge branch 'dev' into 'dev'
Don't show pinned post on single post displaying See merge request hubzilla/core!1804
-rw-r--r--Zotlabs/Module/Channel.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 20a5418c2..5529db70e 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -470,7 +470,7 @@ class Channel extends Controller {
}
// Add pinned content
- if(! $decoded && ! $search) {
+ if(! x($_REQUEST,'mid') && ! $search) {
$pinned = new \Zotlabs\Widget\Pinned;
$r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
$o .= $r['html'];