Another try ...

diff --git a/.php_cs.dist b/.php_cs.dist
index de2ff4ef1e6a43b5b795822de2b7149f35048b9f..897c6f1104b82d33bd248a175b9749409c17d183 100644 (file)
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -33,6 +33,7 @@ return $config
                        'operators' => [
                                '=>' => 'align_single_space_minimal',
                                '='  => 'align_single_space_minimal',
+                               '??' => 'align_single_space_minimal',
                        ],
                ],
                'blank_line_after_namespace'   => true,

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 0d6a04298a851aad688b71cee4ebf8347a68bd69..879e47c24d3e1762a7c11fdeb8e80a7ca8fb229c 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -285,15 +285,15 @@ class Conversation
                $this->profiler->startRecording('rendering');
                $o = '';
 
-               $x['allow_location']   = $x['allow_location'] ?? $user['allow_location'];
+               $x['allow_location']   = $x['allow_location']   ?? $user['allow_location'];
                $x['default_location'] = $x['default_location'] ?? $user['default-location'];
-               $x['nickname']         = $x['nickname'] ?? $user['nickname'];
-               $x['lockstate']        = $x['lockstate'] ?? ACL::getLockstateForUserId($user['uid']) ? 'lock' : 'unlock';
-               $x['acl']              = $x['acl'] ?? ACL::getFullSelectorHTML($this->page, $user['uid'], true);
-               $x['bang']             = $x['bang'] ?? '';
-               $x['visitor']          = $x['visitor'] ?? 'block';
-               $x['is_owner']         = $x['is_owner'] ?? true;
-               $x['profile_uid']      = $x['profile_uid'] ?? local_user();
+               $x['nickname']         = $x['nickname']         ?? $user['nickname'];
+               $x['lockstate']        = $x['lockstate']        ?? ACL::getLockstateForUserId($user['uid']) ? 'lock' : 'unlock';
+               $x['acl']              = $x['acl']              ?? ACL::getFullSelectorHTML($this->page, $user['uid'], true);
+               $x['bang']             = $x['bang']             ?? '';
+               $x['visitor']          = $x['visitor']          ?? 'block';
+               $x['is_owner']         = $x['is_owner']         ?? true;
+               $x['profile_uid']      = $x['profile_uid']      ?? local_user();
 
 
                $geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';