Commit b55374e7 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.25.4'

parents 1190ef69 366c8965
Pipeline #19042196 passed with stages
in 11 minutes and 53 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.25.3';
const VERSION = '4.25.4';
/**
* Performs some startup checks.
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"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.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"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.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/module-categories": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"acp3/module-categories": "^4.25.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"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.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/module-categories": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"acp3/module-categories": "^4.25.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"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.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
{if $sharing.ratings_active === true}
{if !empty($sharing) && $sharing.ratings_active === true}
<hr>
<div id="rating-wrapper">
{include file="asset:Share/Partials/rating.tpl" rating=$sharing.rating}
</div>
{javascripts}
{include_js module="share" file="partials/rating"}
{include_js module="share" file="partials/rating"}
{/javascripts}
{if !empty($sharing.services)}
<hr>
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-users": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-users": "^4.25.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3"
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4"
},
"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.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"ckeditor/ckeditor": "dev-full/4.8.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3",
"acp3/setup": "^4.25.3",
"acp3/module-errors": "^4.25.3",
"acp3/module-permissions": "^4.25.3",
"acp3/module-system": "^4.25.3",
"acp3/module-users": "^4.25.3",
"acp3/core": "^4.25.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-permissions": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [4.25.4] - 2018-03-16
### Fixed
- fixed a possible undefined index error
## [4.25.3] - 2018-03-16
### Fixed
- code styles fixes
......@@ -579,7 +583,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- It should be possible again to save ACL roles
- Silenced a possible PHP warning when trying to login with incorrect credentials
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.25.3...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.25.4...HEAD
[4.25.4]: https://gitlab.com/ACP3/cms/compare/v4.25.3...v4.25.4
[4.25.3]: https://gitlab.com/ACP3/cms/compare/v4.25.2...v4.25.3
[4.25.2]: https://gitlab.com/ACP3/cms/compare/v4.25.1...v4.25.2
[4.25.1]: https://gitlab.com/ACP3/cms/compare/v4.25.0...v4.25.1
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.3"
"acp3/core": "^4.25.4"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.25.3",
"version": "4.25.4",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment