diff --git a/CHANGELOG.md b/CHANGELOG.md index 451bf9083..c927344dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Fixed passing null into `mb_strpos()` deprecated for PHP 8.2+ * Updated internal `TwigDeferredExtension` to be PHP 8.2+ compatible * Upgraded `getgrav/image` fork to take advantage of various PHP 8.2+ fixes + * Use `UserGroupObject::groupNames` method in blueprints # v1.7.40 ## 03/22/2023 diff --git a/system/src/Grav/Common/Helpers/Truncator.php b/system/src/Grav/Common/Helpers/Truncator.php index 318079c36..d271806dc 100644 --- a/system/src/Grav/Common/Helpers/Truncator.php +++ b/system/src/Grav/Common/Helpers/Truncator.php @@ -144,7 +144,7 @@ class Truncator } // Transform multibyte entities which otherwise display incorrectly. - $html = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'); + $html = htmlspecialchars_decode(iconv('UTF-8', 'ISO-8859-1', htmlentities($html, ENT_COMPAT, 'UTF-8')), ENT_QUOTES); // Internal errors enabled as HTML5 not fully supported. libxml_use_internal_errors(true); diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php index 14d09a227..84b53e1e7 100644 --- a/system/src/Grav/Common/Session.php +++ b/system/src/Grav/Common/Session.php @@ -122,10 +122,10 @@ class Session extends \Grav\Framework\Session\Session // Make sure that Forms 3.0+ has been installed. if (null === $object && isset($grav['forms'])) { - user_error( - __CLASS__ . '::' . __FUNCTION__ . '(\'files-upload\') is deprecated since Grav 1.6, use $form->getFlash()->getLegacyFiles() instead', - E_USER_DEPRECATED - ); +// user_error( +// __CLASS__ . '::' . __FUNCTION__ . '(\'files-upload\') is deprecated since Grav 1.6, use $form->getFlash()->getLegacyFiles() instead', +// E_USER_DEPRECATED +// ); /** @var Uri $uri */ $uri = $grav['uri']; diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php index a52bb6de8..b510ed72b 100644 --- a/system/src/Grav/Common/Twig/Twig.php +++ b/system/src/Grav/Common/Twig/Twig.php @@ -57,6 +57,15 @@ class Twig /** @var string */ public $template; + /** @var array */ + public $plugins_hooked_nav = []; + /** @var array */ + public $plugins_quick_tray = []; + /** @var array */ + public $plugins_hooked_dashboard_widgets_top = []; + /** @var array */ + public $plugins_hooked_dashboard_widgets_main = []; + /** @var Grav */ protected $grav; /** @var FilesystemLoader */