Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

Browse source
This commit is contained in:
Michael 2017-01-07 14:31:25 +00:00
parent c2543f918b 98c5eb1d95
commit 1febf182ad
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/dfrn.php
View file

@ -1161,7 +1161,7 @@ class dfrn {
// Until now we aren't serving different sizes - but maybe later // Until now we aren't serving different sizes - but maybe later
$avatarlist = array(); $avatarlist = array();
// @todo check if "avatar" or "photo" would be the best field in the specification /// @todo check if "avatar" or "photo" would be the best field in the specification
$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context); $avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
foreach($avatars AS $avatar) { foreach($avatars AS $avatar) {
$href = ""; $href = "";
@ -1381,7 +1381,7 @@ class dfrn {
$objxml = $obj_doc->saveXML($obj_element); $objxml = $obj_doc->saveXML($obj_element);
// @todo This isn't totally clean. We should find a way to transform the namespaces /// @todo This isn't totally clean. We should find a way to transform the namespaces
$objxml = str_replace("<".$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml); $objxml = str_replace("<".$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
return($objxml); return($objxml);
} }

5
view/templates/settings_display.tpl
View file

@ -6,7 +6,12 @@
{{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$theme}}
{{include file="field_input.tpl" field=$itemspage_network}} {{include file="field_input.tpl" field=$itemspage_network}}
{{* Show the mobile theme selection only if mobile themes are available *}}
{{if count($mobile_theme.4) > 1}}
{{include file="field_themeselect.tpl" field=$mobile_theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}}
{{/if}}
{{include file="field_input.tpl" field=$itemspage_mobile_network}} {{include file="field_input.tpl" field=$itemspage_mobile_network}}
{{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_checkbox.tpl" field=$nowarn_insecure}} {{include file="field_checkbox.tpl" field=$nowarn_insecure}}

3
view/theme/frio/templates/settings_display.tpl
View file

@ -22,7 +22,10 @@
{{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$theme}}
{{* Show the mobile theme selection only if mobile themes are available *}}
{{if count($mobile_theme.4) > 1}}
{{include file="field_themeselect.tpl" field=$mobile_theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}}
{{/if}}
<div class="form-group pull-right settings-submit-wrapper" > <div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button> <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>