diff --git a/composer.lock b/composer.lock index 2aaab974ca..9cdae4a54f 100644 --- a/composer.lock +++ b/composer.lock @@ -117,16 +117,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.1", + "version": "1.11.99.2", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6" + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", "shasum": "" }, "require": { @@ -170,7 +170,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.1" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2" }, "funding": [ { @@ -186,7 +186,7 @@ "type": "tidelift" } ], - "time": "2020-11-11T10:22:58+00:00" + "time": "2021-05-24T07:46:03+00:00" }, { "name": "dasprid/enum", diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index f0c0008a81..c5fd8f4a50 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -1,28 +1,7 @@ . - */ - -declare(strict_types=1); - return [ + /* |-------------------------------------------------------------------------- | View Name @@ -31,9 +10,16 @@ return [ | Choose a view to display when Breadcrumbs::render() is called. | Built in templates are: | - | - 'breadcrumbs::bootstrap4' - Twitter Bootstrap v4 - | - 'breadcrumbs::bootstrap3' - Twitter Bootstrap v3 - | - 'breadcrumbs::bootstrap2' - Twitter Bootstrap v2 + | - 'breadcrumbs::bootstrap5' - Bootstrap 5 + | - 'breadcrumbs::bootstrap4' - Bootstrap 4 + | - 'breadcrumbs::bootstrap3' - Bootstrap 3 + | - 'breadcrumbs::bootstrap2' - Bootstrap 2 + | - 'breadcrumbs::bulma' - Bulma + | - 'breadcrumbs::foundation6' - Foundation 6 + | - 'breadcrumbs::json-ld' - JSON-LD Structured Data + | - 'breadcrumbs::materialize' - Materialize + | - 'breadcrumbs::tailwind' - Tailwind CSS + | - 'breadcrumbs::uikit' - UIkit | | Or a custom view, e.g. '_partials/breadcrumbs'. | @@ -53,7 +39,7 @@ return [ | */ - 'files' => base_path('routes/breadcrumbs.php'), + 'files' => base_path('routes/breadcrumbs.php'), /* |-------------------------------------------------------------------------- @@ -65,13 +51,13 @@ return [ */ // When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException) - 'unnamed-route-exception' => true, + 'unnamed-route-exception' => true, // When route-bound breadcrumbs are used and the matching breadcrumb doesn't exist (InvalidBreadcrumbException) 'missing-route-bound-breadcrumb-exception' => true, // When a named breadcrumb is used but doesn't exist (InvalidBreadcrumbException) - 'invalid-named-breadcrumb-exception' => true, + 'invalid-named-breadcrumb-exception' => true, /* |-------------------------------------------------------------------------- @@ -83,9 +69,9 @@ return [ */ // Manager - 'manager-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class, + 'manager-class' => Diglactic\Breadcrumbs\Manager::class, // Generator - 'generator-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class, + 'generator-class' => Diglactic\Breadcrumbs\Generator::class, ]; diff --git a/resources/views/emails/footer-html.twig b/resources/views/emails/footer-html.twig index a5caad932a..f128f89107 100644 --- a/resources/views/emails/footer-html.twig +++ b/resources/views/emails/footer-html.twig @@ -5,9 +5,11 @@ {{ trans('email.signature') }}
-- {{ trans('email.footer_ps', {ipAddress: ipAddress}) }} -
+{% if '' != ipAddress %} ++ {{ trans('email.footer_ps', {ipAddress: ipAddress}) }} +
+{% endif %}