aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-04-30 22:30:37 +0200
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-04-30 22:30:37 +0200
commit3d9fcee075802d8090a394e458e6bc7faba4af18 (patch)
tree850337863d3c84761e87357d6a13d7c43a7e63a9 /include/conversation.php
parent917bcb55fd3beee4eb8590256a458872b9da7605 (diff)
parent026787fc73cb76975b55425cdec9b6701a097935 (diff)
downloadvolse-hubzilla-3d9fcee075802d8090a394e458e6bc7faba4af18.tar.gz
volse-hubzilla-3d9fcee075802d8090a394e458e6bc7faba4af18.tar.bz2
volse-hubzilla-3d9fcee075802d8090a394e458e6bc7faba4af18.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index b1b47df39..2c1e18099 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1187,7 +1187,7 @@ function status_editor($a, $x, $popup = false) {
$jotplugins = '';
$preview = t('Preview');
- if(x($x, 'nopreview'))
+ if(x($x, 'hide_preview'))
$preview = '';
$defexpire = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_expire')) && (! $webpage)) ? $z : '');