Commit 7f4baa8c authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.9.1'

parents d672b1bb 53ce5d33
......@@ -6,27 +6,28 @@
#SetEnv ACP3_APPLICATION_MODE dev
<IfModule mod_rewrite.c>
RewriteEngine On
Options +FollowSymlinks
DirectoryIndex index.php
</IfModule>
# Uncomment the following lines of code if you want to use separate sitemaps for HTTP and HTTPS
#<IfModule mod_rewrite.c>
# RewriteEngine On
#
# RewriteCond %{HTTPS} =on
# RewriteRule ^ - [env=proto:https]
# RewriteCond %{HTTPS} !=on
# RewriteRule ^ - [env=proto:http]
#
# RewriteCond %{HTTPS} !=on
# RewriteCond %{REQUEST_FILENAME} !-f
# RewriteRule ^sitemap\.xml$ sitemap_http.xml [L,QSA]
# RewriteRule ^sitemap\.xml$ sitemap_http.xml [L]
#
# RewriteCond %{HTTPS} =on
# RewriteCond %{REQUEST_FILENAME} !-f
# RewriteRule ^sitemap\.xml$ sitemap_https.xml [L,QSA]
# RewriteRule ^sitemap\.xml$ sitemap_https.xml [L]
#</IfModule>
<IfModule mod_rewrite.c>
Options +FollowSymlinks
DirectoryIndex index.php
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
......
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.9.0';
const VERSION = '4.9.1';
/**
* Performs some startup checks
......
......@@ -39,7 +39,7 @@ class Uri extends AbstractFunction
{
return $this->router->route(
!empty($params['args']) ? $params['args'] : '',
isset($params['absolute']) ? (bool)$params['absolute'] : false,
isset($params['absolute']) ? (bool)$params['absolute'] : null,
isset($params['secure']) ? (bool)$params['secure'] : false
);
}
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/module-categories": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"acp3/module-categories": "^4.9.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/module-categories": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"acp3/module-categories": "^4.9.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-users": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-users": "^4.9.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0"
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0",
"acp3/setup": "^4.9.0",
"acp3/module-errors": "^4.9.0",
"acp3/module-permissions": "^4.9.0",
"acp3/module-system": "^4.9.0",
"acp3/module-users": "^4.9.0",
"acp3/core": "^4.9.1",
"acp3/setup": "^4.9.1",
"acp3/module-errors": "^4.9.1",
"acp3/module-permissions": "^4.9.1",
"acp3/module-system": "^4.9.1",
"acp3/module-users": "^4.9.1",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,6 +4,13 @@ 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.9.1] - 2017-03-26
### Changed
- some minor optimizations for the .htaccess file
### Fixed
- Fixed the `uri` Smarty function
## [4.9.0] - 2017-03-26
### Added
- Extended the router so that it's possible to force the generation of HTTP URIs
......@@ -318,7 +325,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.9.0...HEAD
[Unreleased]: https://github.com/ACP3/cms/compare/v4.9.1...HEAD
[4.9.1]: https://github.com/ACP3/cms/compare/v4.9.0...v4.9.1
[4.9.0]: https://github.com/ACP3/cms/compare/v4.8.5...v4.9.0
[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
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.9.0"
"acp3/core": "^4.9.1"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.9.0",
"version": "4.9.1",
"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.9.0"
"yargs": "^4.9.1"
}
}
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