Commit 9d1cc5e9 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.27.1'

parents 6cbbb54c cb99434b
Pipeline #25589717 passed with stages
in 4 minutes and 5 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.27.0';
const VERSION = '4.27.1';
/**
* Performs some startup checks.
......
......@@ -31,12 +31,12 @@
"php-http/guzzle6-adapter": "^1.1",
"smarty/smarty": "^3.1",
"cocur/slugify": "^3.0",
"symfony/config": "^3.3",
"symfony/dependency-injection": "^3.3",
"symfony/event-dispatcher": "^3.3",
"symfony/http-foundation": "^3.3",
"symfony/http-kernel": "^3.3",
"symfony/yaml": "^3.3",
"symfony/config": "^3.4",
"symfony/dependency-injection": "^3.4",
"symfony/event-dispatcher": "^3.4",
"symfony/http-foundation": "^3.4",
"symfony/http-kernel": "^3.4",
"symfony/yaml": "^3.4",
"toflar/psr6-symfony-http-cache-store": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0",
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -9,7 +9,6 @@ namespace ACP3\Modules\ACP3\Comments\Controller\Admin\Details;
use ACP3\Core;
use ACP3\Modules\ACP3\Comments;
use ACP3\Modules\ACP3\System;
class Delete extends Core\Controller\AbstractFrontendAction
{
......
......@@ -9,7 +9,6 @@ namespace ACP3\Modules\ACP3\Comments\Controller\Admin\Details;
use ACP3\Core;
use ACP3\Modules\ACP3\Comments;
use ACP3\Modules\ACP3\System;
use ACP3\Modules\ACP3\System\Installer\Schema;
class Index extends Core\Controller\AbstractFrontendAction
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0",
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0",
"acp3/module-categories": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1",
"acp3/module-categories": "^4.27.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -34,6 +34,11 @@ class ManageMenuItemOnModelSaveAfterListener
$this->acl = $acl;
}
/**
* @param \ACP3\Core\Model\Event\ModelSaveEvent $event
*
* @throws \Doctrine\DBAL\ConnectionException
*/
public function createOrUpdateMenuItem(ModelSaveEvent $event)
{
if ($this->acl->hasPermission('admin/menus/items/create') === true
......@@ -50,7 +55,8 @@ class ManageMenuItemOnModelSaveAfterListener
];
$this->menuItemManager->manageMenuItem(
\sprintf($formData['menu_item_uri_pattern'], $event->getEntryId()), $data
\sprintf($formData['menu_item_uri_pattern'], $event->getEntryId()),
isset($formData['create_menu_item']) ? $data : []
);
}
}
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0",
"acp3/module-categories": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1",
"acp3/module-categories": "^4.27.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0",
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
/*!
* shariff - v3.0.0 - Thu, 15 Mar 2018 08:53:45 GMT
* shariff - v3.0.1 - Tue, 17 Apr 2018 06:12:42 GMT
* https://github.com/heiseonline/shariff
* Copyright (c) 2018 Ines Pauer, Philipp Busse, Sebastian Hilbig, Erich Kramer, Deniz Sesli
* Licensed under the MIT license
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0",
"acp3/module-users": "^4.27.0",
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1",
"acp3/module-users": "^4.27.1",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -119,7 +119,7 @@
.cookie-consent .cookie-consent__button {
margin-left: 15px;
}
.cookie-consent p {
.cookie-consent .cookie-consent__body {
overflow: hidden;
}
/* ACP */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-users": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-users": "^4.27.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.27.0",
"acp3/setup": "^4.27.0",
"acp3/module-errors": "^4.27.0",
"acp3/module-permissions": "^4.27.0",
"acp3/module-system": "^4.27.0"
"acp3/core": "^4.27.1",
"acp3/setup": "^4.27.1",
"acp3/module-errors": "^4.27.1",
"acp3/module-permissions": "^4.27.1",
"acp3/module-system": "^4.27.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/
......
/**
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.