Skip to content

Commit 5d0ae74

Browse files
committed
Update to 8.4.2
1 parent 323747c commit 5d0ae74

16 files changed

Lines changed: 284 additions & 251 deletions

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
basedir=".">
44

55
<property name="VERSION"
6-
value="8.4.1" />
6+
value="8.4.2" />
77

88
<tstamp>
99
<format property="DATE"

language/en-GB/en-GB.mod_junewsultra.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ MOD_JUNEWS_IMAGE_FAR_PARAMS = "Forced proportion parameters"
241241
MOD_JUNEWS_FIELD_YTTYPE_CHANNEL = "YouTube channel"
242242
MOD_JUNEWS_FIELD_YTTYPE_CHANNEL_LABEL = "Enter YouTube channel"
243243
MOD_JUNEWS_ALL_INHREF_CATEGORY_CSS = "CSS class for link"
244-
MOD_JUNEWS_RSSXML_ERROR = "Error retrieving data..."
245244
MOD_JUNEWS_USE_SRCSET = "Browser support for responsive images based on srcset technology.<br>Before enabling, configure thumbnail sizes."
246245
MOD_JUNEWS_USE_SRCSET_DESC = "Use browser srcset support instead of image replacement for mobile and responsive sites"
247246
MOD_JUNEWS_SRCSET_VIEWPORT = "Based on viewport width"

language/kk-KZ/kk-KZ.mod_junewsultra.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ MOD_JUNEWS_IMAGE_FAR_PARAMS = "Мәжбүрлі пропорция параме
241241
MOD_JUNEWS_FIELD_YTTYPE_CHANNEL = "YouTube арнасы"
242242
MOD_JUNEWS_FIELD_YTTYPE_CHANNEL_LABEL = "YouTube арнасын енгізіңіз"
243243
MOD_JUNEWS_ALL_INHREF_CATEGORY_CSS = "Сілтеме үшін CSS класы"
244-
MOD_JUNEWS_RSSXML_ERROR = "Деректерді алу қатесі..."
245244
MOD_JUNEWS_USE_SRCSET = "srcset технологиясына негізделген адаптивті суреттерді браузер қолдауы.<br>Қосар алдында сурет эскиздерінің өлшемдерін баптаңыз."
246245
MOD_JUNEWS_USE_SRCSET_DESC = "Мобильді және адаптивті сайттар үшін суреттерді ауыстырудың орнына браузердің srcset қолдауын пайдаланыңыз"
247246
MOD_JUNEWS_SRCSET_VIEWPORT = "Viewport еніне негізделген"

language/uk-UA/uk-UA.mod_junewsultra.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ MOD_JUNEWS_IMAGE_FAR_PARAMS = "Параметри примусової проп
241241
MOD_JUNEWS_FIELD_YTTYPE_CHANNEL = "Канал YouTube"
242242
MOD_JUNEWS_FIELD_YTTYPE_CHANNEL_LABEL = "Впишіть канал YouTube"
243243
MOD_JUNEWS_ALL_INHREF_CATEGORY_CSS = "CSS-клас для посилання"
244-
MOD_JUNEWS_RSSXML_ERROR = "Помилка отримання даних..."
245244
MOD_JUNEWS_USE_SRCSET = "Браузерна підтримка адаптивних зоражень заснована на технології srcset.<br>Перед тим як включити налаштуйте розміри ескізів зображень."
246245
MOD_JUNEWS_USE_SRCSET_DESC = "Використовуйте браузерну підтримку srcset заміни зображень для мобільних та адаптивних сайтів"
247246
MOD_JUNEWS_SRCSET_VIEWPORT = "Засновано на ширині Viewport"

packages/mod_junewsultra/Helper.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
use Joomla\CMS\Factory;
1414
use Joomla\CMS\HTML\Helpers\Bootstrap;
1515
use Joomla\CMS\HTML\HTMLHelper;
16-
use Joomla\CMS\Language\Text;
1716
use Joomla\CMS\Uri\Uri;
1817
use Joomla\Database\DatabaseInterface;
1918
use Joomla\String\StringHelper;
2019

21-
defined('_JEXEC') or die;
20+
// phpcs:disable PSR1.Files.SideEffects
21+
\defined('_JEXEC') or die;
22+
// phpcs:enable PSR1.Files.SideEffects
2223

2324
require_once(JPATH_SITE . '/libraries/juimage/vendor/autoload.php');
2425

@@ -613,8 +614,7 @@ public function xml($feed_url, $xmlcount, $cache_file, $time, $path, $ordering_x
613614
libxml_use_internal_errors(true);
614615
try
615616
{
616-
$items = '';
617-
$xml = new SimpleXmlElement($string);
617+
$xml = new SimpleXmlElement($string);
618618

619619
switch($ordering_xml)
620620
{
@@ -634,7 +634,7 @@ public function xml($feed_url, $xmlcount, $cache_file, $time, $path, $ordering_x
634634
}
635635
catch (Exception)
636636
{
637-
return '<div class="uk-alert-warning" data-uk-alert>' . Text::_('MOD_JUNEWS_RSSXML_ERROR') . '</div>';
637+
return [];
638638
}
639639

640640
return $items;

packages/mod_junewsultra/fields/commentsradio.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
use Joomla\CMS\HTML\HTMLHelper;
1515
use Joomla\CMS\Language\Text;
1616

17-
defined('_JEXEC') or die;
17+
// phpcs:disable PSR1.Files.SideEffects
18+
\defined('_JEXEC') or die;
19+
20+
// phpcs:enable PSR1.Files.SideEffects
1821

1922
#[AllowDynamicProperties]
2023
class JFormFieldCommentsRadio extends FormField

packages/mod_junewsultra/fields/integration.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
use Joomla\CMS\Form\FormField;
1414
use Joomla\CMS\Language\Text;
1515

16-
defined('JPATH_PLATFORM') or die;
16+
// phpcs:disable PSR1.Files.SideEffects
17+
\defined('_JEXEC') or die;
18+
19+
// phpcs:enable PSR1.Files.SideEffects
1720

1821
#[AllowDynamicProperties]
1922
class JFormFieldIntegration extends FormField

packages/mod_junewsultra/fields/multicategories.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
use Joomla\CMS\HTML\HTMLHelper;
1616
use Joomla\Database\DatabaseInterface;
1717

18-
defined('JPATH_PLATFORM') or die;
18+
// phpcs:disable PSR1.Files.SideEffects
19+
\defined('_JEXEC') or die;
20+
// phpcs:enable PSR1.Files.SideEffects
1921

2022
FormHelper::loadFieldClass('list');
2123

packages/mod_junewsultra/fields/newsfilelist.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
use Joomla\Filesystem\File;
1818
use Joomla\Filesystem\Folder;
1919

20-
defined('JPATH_PLATFORM') or die;
20+
// phpcs:disable PSR1.Files.SideEffects
21+
\defined('_JEXEC') or die;
22+
// phpcs:enable PSR1.Files.SideEffects
2123

2224
FormHelper::loadFieldClass('list');
2325

packages/mod_junewsultra/helper/com_content.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
* @license GNU/GPL - https://gnu.org/copyleft/gpl.html
1111
*/
1212

13-
defined('_JEXEC') or die;
14-
1513
use Joomla\CMS\Access\Access;
1614
use Joomla\CMS\Component\ComponentHelper;
1715
use Joomla\CMS\HTML\HTMLHelper;
@@ -20,6 +18,10 @@
2018
use Joomla\CMS\Router\Route;
2119
use Joomla\Component\Content\Site\Helper\RouteHelper;
2220

21+
// phpcs:disable PSR1.Files.SideEffects
22+
\defined('_JEXEC') or die;
23+
// phpcs:enable PSR1.Files.SideEffects
24+
2325
/**
2426
* Helper for mod_junewsultra
2527
*
@@ -444,7 +446,14 @@ public function order($order): string
444446
return $ordering;
445447
}
446448

447-
protected function tags($id)
449+
/**
450+
* @param $id
451+
*
452+
* @return array
453+
*
454+
* @since 6.0
455+
*/
456+
protected function tags($id): array
448457
{
449458
$qtag = $this->db->getQuery(true);
450459
$qtag->select([
@@ -756,7 +765,7 @@ public function getList($params, $junews): array
756765
}
757766
}
758767

759-
if($junews[ 'sourcetext' ] == 1 && isset($introtext) && isset($fulltext))
768+
if(isset($introtext, $fulltext) && $junews[ 'sourcetext' ] == 1)
760769
{
761770
$item->sourcetext = $introtext . $fulltext;
762771
}

0 commit comments

Comments
 (0)