diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-05 07:22:31 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-05 07:22:31 +0200 |
| commit | b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1 (patch) | |
| tree | 7a87cf3eb149e3953becf042d9327892481ecd23 | |
| parent | f995ef012444617ead1760d16f712ca0051dc68b (diff) | |
| parent | 6e91d85bcb3e98874f4c5d06ccaf1bca26577872 (diff) | |
| download | volse-hubzilla-b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1.tar.gz volse-hubzilla-b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1.tar.bz2 volse-hubzilla-b0ca73c1ba351b5516c467acdf5dc212c5a2a7c1.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | include/network.php | 2 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php index c55660da8..26ed24de2 100644 --- a/include/network.php +++ b/include/network.php @@ -797,7 +797,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = if($namespaces) $parser = @xml_parser_create_ns("UTF-8",':'); else - $parser = @xml_parser_create('UTF-8'); + $parser = @xml_parser_create(); if(! $parser) { logger('xml2array: xml_parser_create: no resource'); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index a408a83d2..dd83bd9e9 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -31,7 +31,7 @@ <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> {{if $item.thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret"></i> + <i class="fa fa-caret-down wall-item-photo-caret fakelink" data-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> |