Commit 74f2e0d7 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.8.5'

parents 64be4393 044c3805
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.8.4';
const VERSION = '4.8.5';
/**
* Performs some startup checks
......
......@@ -199,14 +199,18 @@ class Mailer
}
/**
* @param string $attachment
* @param string|array $attachments
*
* @return $this
* @deprecated since version 4.8.0, to be removed with version 5.0.0
*/
public function setAttachments($attachment)
public function setAttachments($attachments)
{
$this->attachments[] = $attachment;
if (is_array($attachments)) {
$this->attachments = $attachments;
} else {
$this->attachments[] = $attachments;
}
return $this;
}
......
......@@ -206,12 +206,22 @@ class MailerMessage
* @param array $attachments
* @return $this
*/
public function setAttachments($attachments)
public function setAttachments(array $attachments)
{
$this->attachments = $attachments;
return $this;
}
/**
* @param string $attachment
* @return $this
*/
public function addAttachment($attachment)
{
$this->attachments[] = $attachment;
return $this;
}
/**
* @return string
*/
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/module-categories": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"acp3/module-categories": "^4.8.5"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/module-categories": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"acp3/module-categories": "^4.8.5"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-users": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-users": "^4.8.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4"
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4",
"acp3/setup": "^4.8.4",
"acp3/module-errors": "^4.8.4",
"acp3/module-permissions": "^4.8.4",
"acp3/module-system": "^4.8.4",
"acp3/module-users": "^4.8.4",
"acp3/core": "^4.8.5",
"acp3/setup": "^4.8.5",
"acp3/module-errors": "^4.8.5",
"acp3/module-permissions": "^4.8.5",
"acp3/module-system": "^4.8.5",
"acp3/module-users": "^4.8.5",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,7 +4,7 @@ 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.8.4] - 2017-03-19
## [4.8.5] - 2017-03-19
### Fixed
- Fixed the attachment handling of the `Mailer` when using the new `MailerMessage` class
......@@ -307,8 +307,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://github.com/ACP3/cms/compare/v4.8.4...HEAD
[4.8.4]: https://github.com/ACP3/cms/compare/v4.8.3...v4.8.4
[Unreleased]: https://github.com/ACP3/cms/compare/v4.8.5...HEAD
[4.8.5]: https://github.com/ACP3/cms/compare/v4.8.3...v4.8.5
[4.8.3]: https://github.com/ACP3/cms/compare/v4.8.2...v4.8.3
[4.8.2]: https://github.com/ACP3/cms/compare/v4.8.1...v4.8.2
[4.8.1]: https://github.com/ACP3/cms/compare/v4.8.0...v4.8.1
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.4"
"acp3/core": "^4.8.5"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.8.4",
"version": "4.8.5",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......@@ -35,6 +35,6 @@
"jquery": "^2.2.4",
"js-cookie": "^2.1.3",
"moment": "^2.15.0",
"yargs": "^4.8.4"
"yargs": "^4.8.5"
}
}
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