From 686a7dbe01220e04f1e9fcdd8b92220a47085aa2 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 5 Jan 2017 02:23:34 +0100 Subject: [PATCH 1/3] Bugfix: make some todos usable for doxygen in dfrn.php --- include/dfrn.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 689c5c2832..fef9ae2fed 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1161,7 +1161,7 @@ class dfrn { // Until now we aren't serving different sizes - but maybe later $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); foreach($avatars AS $avatar) { $href = ""; @@ -1381,7 +1381,7 @@ class dfrn { $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); return($objxml); } From 0994a0ced50c30f5b7a640570f23416b8808c6a6 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 5 Jan 2017 02:52:39 +0100 Subject: [PATCH 2/3] Frio: Show mobile theme selection only if mobile themes are available --- view/theme/frio/templates/settings_display.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/theme/frio/templates/settings_display.tpl b/view/theme/frio/templates/settings_display.tpl index 06709f3043..e2b84fc34b 100644 --- a/view/theme/frio/templates/settings_display.tpl +++ b/view/theme/frio/templates/settings_display.tpl @@ -22,7 +22,10 @@ {{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}} + {{/if}}
From 898761b4a0cfa1aad6f570c753d4b612f18393a2 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 7 Jan 2017 00:22:22 +0100 Subject: [PATCH 3/3] Show mobile theme selection only if mobile themes are available (default template) --- view/templates/settings_display.tpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl index 6f5a065508..ef2091035f 100644 --- a/view/templates/settings_display.tpl +++ b/view/templates/settings_display.tpl @@ -6,7 +6,12 @@ {{include file="field_themeselect.tpl" field=$theme}} {{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}} +{{/if}} + {{include file="field_input.tpl" field=$itemspage_mobile_network}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_checkbox.tpl" field=$nowarn_insecure}}