Просмотр исходного кода

Fix show_tags_max (#5978)

fix https://github.com/FreshRSS/FreshRSS/issues/5975
Regression from https://github.com/FreshRSS/FreshRSS/pull/5830
Alexandre Alapetite 2 лет назад
Родитель
Сommit
e968964538
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      app/views/index/normal.phtml
  2. 1 1
      app/views/index/reader.phtml
  3. 1 1
      config-user.default.php

+ 1 - 1
app/views/index/normal.phtml

@@ -14,7 +14,7 @@ $display_others = true;
 $hidePosts = !FreshRSS_Context::userConf()->display_posts;
 $lazyload = FreshRSS_Context::userConf()->lazyload;
 $content_width = FreshRSS_Context::userConf()->content_width;
-$MAX_TAGS_DISPLAYED = FreshRSS_Context::userConf()->show_tags_max;
+$MAX_TAGS_DISPLAYED = (int)FreshRSS_Context::userConf()->show_tags_max;
 $useKeepUnreadImportant = !FreshRSS_Context::isImportant() && !FreshRSS_Context::isFeed();
 
 $today = @strtotime('today');

+ 1 - 1
app/views/index/reader.phtml

@@ -10,7 +10,7 @@ call_user_func($this->callbackBeforeEntries, $this);
 
 $lazyload = FreshRSS_Context::userConf()->lazyload;
 $content_width = FreshRSS_Context::userConf()->content_width;
-$MAX_TAGS_DISPLAYED = FreshRSS_Context::userConf()->show_tags_max;
+$MAX_TAGS_DISPLAYED = (int)FreshRSS_Context::userConf()->show_tags_max;
 ?>
 <main id="stream" class="reader">
 	<h1 class="title_hidden"><?= _t('conf.reading.view.reader') ?></h1>

+ 1 - 1
config-user.default.php

@@ -37,7 +37,7 @@ return array (
 	'display_posts' => false,
 	'display_categories' => 'active',	//{ active, remember, all, none }
 	'show_tags' => '0',
-	'show_tags_max' => '7',
+	'show_tags_max' => 7,
 	'show_author_date' => 'h',
 	'show_feed_name' => 'a',
 	'hide_read_feeds' => true,