Commit 10406588 authored by Tino Goratsch's avatar Tino Goratsch

Merge tag 'v4.25.5' into develop

v4.25.5
parents 19f5123b 9728df83
Pipeline #19077401 failed with stages
in 7 minutes and 52 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.25.4';
const VERSION = '4.25.5';
/**
* Performs some startup checks.
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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"
"acp3/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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"
"acp3/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"acp3/module-categories": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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"
"acp3/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"acp3/module-categories": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"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.4",
"acp3/setup": "^4.25.4",
"acp3/module-errors": "^4.25.4",
"acp3/module-system": "^4.25.4",
"acp3/module-users": "^4.25.4"
"acp3/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -9,13 +9,19 @@ namespace ACP3\Modules\ACP3\Share\Event\Listener;
use ACP3\Core\Controller\AreaEnum;
use ACP3\Core\Http\RequestInterface;
use ACP3\Core\Modules;
use ACP3\Core\View;
use ACP3\Modules\ACP3\Share\Helpers\SocialServices;
use ACP3\Modules\ACP3\Share\Installer\Schema;
use ACP3\Modules\ACP3\Share\Model\Repository\ShareRatingsRepository;
use ACP3\Modules\ACP3\Share\Model\Repository\ShareRepository;
class AddSocialSharingListener
{
/**
* @var \ACP3\Core\Modules
*/
private $modules;
/**
* @var \ACP3\Core\Http\RequestInterface
*/
......@@ -39,7 +45,7 @@ class AddSocialSharingListener
/**
* AddSocialSharingListener constructor.
*
* @param \ACP3\Core\Modules $modules
* @param \ACP3\Core\Http\RequestInterface $request
* @param \ACP3\Core\View $view
* @param \ACP3\Modules\ACP3\Share\Helpers\SocialServices $socialServices
......@@ -47,6 +53,7 @@ class AddSocialSharingListener
* @param \ACP3\Modules\ACP3\Share\Model\Repository\ShareRatingsRepository $shareRatingsRepository
*/
public function __construct(
Modules $modules,
RequestInterface $request,
View $view,
SocialServices $socialServices,
......@@ -58,6 +65,7 @@ class AddSocialSharingListener
$this->socialServices = $socialServices;
$this->shareRepository = $shareRepository;
$this->shareRatingsRepository = $shareRatingsRepository;
$this->modules = $modules;
}
/**
......@@ -65,6 +73,10 @@ class AddSocialSharingListener
*/
public function execute(): void
{
if ($this->modules->isActive(Schema::MODULE_NAME) === false) {
return;
}
if ($this->request->getArea() === AreaEnum::AREA_FRONTEND) {
$sharingInfo = $this->shareRepository->getOneByUri($this->request->getUriWithoutPages());
......
......@@ -7,6 +7,7 @@ services:
share.event.add_social_sharing_listener:
class: ACP3\Modules\ACP3\Share\Event\Listener\AddSocialSharingListener
arguments:
- '@core.modules'
- '@core.http.request'
- '@core.view'
- '@share.helpers.social_services'
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"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"
"acp3/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-users": "^4.25.5"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5"
},
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"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.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/core": "^4.25.5",
"acp3/setup": "^4.25.5",
"acp3/module-errors": "^4.25.5",
"acp3/module-permissions": "^4.25.5",
"acp3/module-system": "^4.25.5",
"acp3/module-users": "^4.25.5",
"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.5] - 2018-03-18
### Fixed
- fixed a possible 500 error on pages where the social sharing should be included but the module is not installed at all
## [4.25.4] - 2018-03-16
### Fixed
- fixed a possible undefined index error
......@@ -583,7 +587,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.4...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.25.5...HEAD
[4.25.5]: https://gitlab.com/ACP3/cms/compare/v4.25.4...v4.25.5
[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
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.4"
"acp3/core": "^4.25.5"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.25.4",
"version": "4.25.5",
"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