diff --git a/README.md b/README.md index 4ed4a98..ade5e60 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # UIkit 3 Accordion - Content plugin -![Version](https://img.shields.io/badge/VERSION-1.1.0-0366d6.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/VERSION-1.1.1-0366d6.svg?style=for-the-badge) ![Joomla](https://img.shields.io/badge/joomla-3.7+-1A3867.svg?style=for-the-badge) ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) diff --git a/README.ru.md b/README.ru.md index 4c6cd4f..640fab0 100644 --- a/README.ru.md +++ b/README.ru.md @@ -1,6 +1,6 @@ # UIkit 3 Accordion - Content plugin -![Version](https://img.shields.io/badge/VERSION-1.1.0-0366d6.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/VERSION-1.1.1-0366d6.svg?style=for-the-badge) ![Joomla](https://img.shields.io/badge/joomla-3.7+-1A3867.svg?style=for-the-badge) ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) diff --git a/uk3accordion.php b/uk3accordion.php index 14977f4..b23b5cf 100644 --- a/uk3accordion.php +++ b/uk3accordion.php @@ -82,15 +82,14 @@ public function onContentPrepare($context, &$article, &$params, $page = 0) foreach ($matches[0] as $match) { if ($accordion[$accordionCount] < 3) { $title = preg_replace('|{accordion\s(.*)}|U', '\\1', $match); - $title = strip_tags($title); $id = 'slide-' . OutputFilter::stringURLSafe($title); - $match = '|' . $match . '|U'; + $match = '/' . str_replace(['/', '?'], ['\/', '\?'], preg_quote($match)) . '/U'; ob_start(); include $layout . ($accordion[$accordionCount] < 2 ? '_start.php' : '_li_end.php'); include $layout . '_li_start.php'; $accordion_content = ob_get_clean(); } elseif ($accordion[$accordionCount] == 3) { - $match = '|{/accordion}|U'; + $match = '/{\/accordion}/U'; ob_start(); include $layout . '_li_end.php'; include $layout . '_end.php'; diff --git a/uk3accordion.xml b/uk3accordion.xml index 7c4d0b6..e6e9f4d 100644 --- a/uk3accordion.xml +++ b/uk3accordion.xml @@ -1,8 +1,8 @@ PLG_CONTENT_UK3ACCORDION - 1.1.0 - July 2021 + 1.1.1 + January 2022 Aleksey A. Morozov alekvolsk@yandex.ru https://alekvolsk.pw/