bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #13275 from MrPetovan/bug/warnings

Browse source 
Address a couple warnings
This commit is contained in:
Tobias Diekershoff 2023-07-11 15:27:21 +02:00 committed by GitHub
commit b3f8c0e0c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/Conversation.php
View file

@ -589,6 +589,10 @@ class Conversation
*/ */
public function getThreadList(array $items, string $mode, bool $preview, bool $pagedrop, string $formSecurityToken): array public function getThreadList(array $items, string $mode, bool $preview, bool $pagedrop, string $formSecurityToken): array
{ {
if (!$items) {
return [];
}
if (in_array($mode, [self::MODE_FILED, self::MODE_SEARCH, self::MODE_CONTACT_POSTS])) { if (in_array($mode, [self::MODE_FILED, self::MODE_SEARCH, self::MODE_CONTACT_POSTS])) {
$threads = $this->getContextLessThreadList($items, $mode, $preview, $pagedrop, $formSecurityToken); $threads = $this->getContextLessThreadList($items, $mode, $preview, $pagedrop, $formSecurityToken);
} else { } else {

2
view/templates/settings/addons/connector.tpl
View file

@ -9,7 +9,7 @@
<div class="clear"></div> <div class="clear"></div>
{{if $submit}} {{if $submit}}
<div class="settings-submit-wrapper panel-footer"> <div class="settings-submit-wrapper panel-footer">
{{if $submit}} {{if $submit|is_string}}
<button type="submit" name="{{$connector}}-submit" class="btn btn-primary settings-submit" value="{{$submit}}">{{$submit}}</button> <button type="submit" name="{{$connector}}-submit" class="btn btn-primary settings-submit" value="{{$submit}}">{{$submit}}</button>
{{else}} {{else}}
{{$count = 1}} {{$count = 1}}

2
view/theme/frio/templates/settings/addons/connector.tpl
View file

@ -11,7 +11,7 @@
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
{{if $submit}} {{if $submit}}
{{if $submit}} {{if $submit|is_string}}
<button type="submit" name="{{$connector}}-submit" class="btn btn-primary settings-submit" value="{{$submit}}">{{$submit}}</button> <button type="submit" name="{{$connector}}-submit" class="btn btn-primary settings-submit" value="{{$submit}}">{{$submit}}</button>
{{else}} {{else}}
{{$count = 1}} {{$count = 1}}