Frio: admin/users template

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 9647fac35f1e135ad67b1ef2332a7efabae76167..8a2887d6b742f6f9d9aed74677469e69446ea102 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -757,7 +757,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 
                                $profile_name_e = $profile_name;
 
-                               if (!empty($item['content-warning']) && PConfig::get(local_user(), 'social', 'disable_cw', false)) {
+                               if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
                                        $title_e = ucfirst($item['content-warning']);
                                } else {
                                        $title_e = $item['title'];
@@ -1335,6 +1335,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
        $tpl = get_markup_template("jot.tpl");
 
        $o .= replace_macros($tpl,[
+               '$new_post' => L10n::t('New Post'),
                '$return_path'  => $query_str,
                '$action'       => 'item',
                '$share'        => defaults($x, 'button', L10n::t('Share')),