mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-27 01:40:22 +02:00
Code Issues Releases Wiki Activity

#4512: faqs_shortcodes::sc_faq_count(): Return blank string instead of 0

Browse Source 
Previously incorrect null coalesce returns 0 instead of a blank string

Fixes: #4512
This commit is contained in:
Nick Liu
2021-06-07 21:29:21 -05:00
parent a6e287d680
commit 7cef4264c6
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/faqs/faqs_shortcodes.php
View File

@@ -283,7 +283,7 @@ class faqs_shortcodes extends e_shortcode
return "<span class='faq-total'>(".($this->counter -1).")</span>"; return "<span class='faq-total'>(".($this->counter -1).")</span>";
} }
return isset($this->var['f_count']) ? $this->var['f_count'] : 0; return isset($this->var['f_count']) ? $this->var['f_count'] : '';
} }
function sc_faq_cat_diz() function sc_faq_cat_diz()

54
e107_tests/tests/unit/e_parse_shortcodeTest.php
View File

@@ -1024,6 +1024,60 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
} }
/**
* @see https://github.com/e107inc/e107/issues/4512
* @throws Exception
*/
public function testFaqShortcodesDisplayFaqTotal()
{
require_once(e_PLUGIN."faqs/faqs_shortcodes.php");
/** @var faqs_shortcodes $sc */
$sc = $this->make('faqs_shortcodes');
$faqsConfig = e107::getPlugConfig("faqs");
$beforePref = $faqsConfig->getPref("display_total");
try
{
$faqsConfig->setPref("display_total", true);
$sc->counter = $counter = 593407;
$output = e107::getParser()->parseTemplate("<small>{FAQ_COUNT}</small>", true, $sc);
$this->assertEquals("<small><span class='faq-total'>(".($counter-1).")</span></small>", $output);
}
finally
{
$faqsConfig->setPref("display_total", $beforePref);
}
}
/**
* @see https://github.com/e107inc/e107/issues/4512
* @throws Exception
*/
public function testFaqShortcodesDoNotDisplayFaqTotal()
{
require_once(e_PLUGIN . "faqs/faqs_shortcodes.php");
/** @var faqs_shortcodes $sc */
$sc = $this->make('faqs_shortcodes');
$faqsConfig = e107::getPlugConfig("faqs");
$beforePref = $faqsConfig->getPref("display_total");
try
{
$faqsConfig->setPref("display_total", false);
$sc->counter = 1017703;
$output = e107::getParser()->parseTemplate("<small>{FAQ_COUNT}</small>", true, $sc);
$this->assertEquals("<small></small>", $output);
}
finally
{
$faqsConfig->setPref("display_total", $beforePref);
}
}
public function testFpwShortcodes() public function testFpwShortcodes()
{ {
require_once(e_CORE."shortcodes/batch/fpw_shortcodes.php"); require_once(e_CORE."shortcodes/batch/fpw_shortcodes.php");