Commit be073861 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.12.2'

parents ae404fe1 0fe15489
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.12.1';
const VERSION = '4.12.2';
/**
* Performs some startup checks
......
......@@ -347,7 +347,7 @@ class Mailer
$mail = [
'charset' => 'UTF-8',
'title' => $this->subject,
'body' => !empty($this->htmlBody) ? $this->htmlBody : $this->stringFormatter->nl2p($this->body),
'body' => !empty($this->htmlBody) ? $this->htmlBody : $this->stringFormatter->nl2p(htmlspecialchars($this->body)),
'signature' => $this->getHtmlSignature(),
'url_web_view' => $this->urlWeb
];
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/module-categories": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/module-categories": "^4.12.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/module-categories": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/module-categories": "^4.12.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-users": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-users": "^4.12.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1"
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"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.12.2] - 2017-08-16
### Fixed
- Correctly escape the special HTML characters, so that the Email sending isn't breaking
## [4.12.1] - 2017-08-14
### Fixed
- Fixed a BC break inside the `Mailer` class which came with the introduction of the `MailerMessage` class
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.1"
"acp3/core": "^4.12.2"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.12.1",
"version": "4.12.2",
"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