From ca6c9345b2932b1f955d9d037fa6ed136e84bdc6 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Thu, 3 Nov 2022 22:36:13 +0100
Subject: fix: dyn. OPML icon (#4810)

* fix
---
 app/Models/Themes.php              | 4 ++--
 app/views/subscription/index.phtml | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index f84b9b800..d652ada5b 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -144,9 +144,9 @@ class FreshRSS_Themes extends Minz_Model {
 		}
 
 		if ($type == self::ICON_DEFAULT) {
-			if ((FreshRSS_Context::$user_conf && FreshRSS_Context::$user_conf->icons_as_emojis) ||
+			if ((FreshRSS_Context::$user_conf && FreshRSS_Context::$user_conf->icons_as_emojis)
 				// default to emoji alternate for some icons
-				in_array($name, [ 'opml-dyn' ])) {
+				) {
 				$type = self::ICON_EMOJI;
 			} else {
 				$type = self::ICON_IMG;
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 76b6279b7..7ee7a3188 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -35,8 +35,7 @@
 		<div class="box">
 			<div class="box-title">
 				<a class="configure open-slider" href="<?= _url('subscription', 'category', 'id', $cat->id()) ?>" data-cat-position="<?= $cat->attributes('position') ?>"><?= _i('configure') ?></a>
-				<h2><?= $cat->name() ?></h2>
-				<?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo _i('opml-dyn'); } ?>
+				<h2><?= $cat->name() ?><?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo " " . _i('opml-dyn'); } ?></h2>
 			</div>
 			<ul class="box-content drop-zone scrollbar-thin" dropzone="move" data-cat-id="<?= $cat->id() ?>">
 				<?php
-- 
cgit v1.2.3