Skip to content
Permalink
Browse files

Merge branch 'release-1.0'

  • Loading branch information...
corpsee committed May 18, 2019
2 parents a028012 + 4341d9d commit 7cdbccef7c9ea4bb65e19e76edc97da33f2c4c00
Showing with 18 additions and 11 deletions.
  1. +15 −1 CHANGELOG.md
  2. +1 −1 VERSION.md
  3. +0 −7 public/.htaccess.dist
  4. +2 −2 src/Plugin/Phing.php
@@ -5,13 +5,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
[Semantic Versioning](http://semver.org/spec/v2.0.0.html).


## [1.0.10 (Morty Smith)](https://github.com/php-censor/php-censor/tree/1.0.10) (2019-05-18)

[Full Changelog](https://github.com/php-censor/php-censor/compare/1.0.9...1.0.10)

### Fixed

- Phing plugin property `directory`. Issue [#304](https://github.com/php-censor/php-censor/issues/304).

### Removed

- Useless `.htaccess.dist` file from `public` directory. Issue
[#305](https://github.com/php-censor/php-censor/issues/305).


## [1.0.9 (Morty Smith)](https://github.com/php-censor/php-censor/tree/1.0.9) (2019-05-12)

[Full Changelog](https://github.com/php-censor/php-censor/compare/1.0.8...1.0.9)

### Fixed

- Fixed warning on exception page when user don't loggin.
Phing plugin property `directory`. Issue #304.

### Changed

@@ -1 +1 @@
1.0.9
1.0.10

This file was deleted.

@@ -158,7 +158,7 @@ public function propertiesToString()
* @ticket 748
*/
if (!isset($this->properties['project.basedir'])) {
$this->properties['project.basedir'] = $this->getDirectory();
$this->properties['project.basedir'] = $this->directory;
}
$propertiesString = [];
@@ -200,7 +200,7 @@ public function getPropertyFile()
*/
public function setPropertyFile($propertyFile)
{
if (!file_exists($this->getDirectory() . '/' . $propertyFile)) {
if (!file_exists($this->directory . '/' . $propertyFile)) {
throw new \Exception('Specified property file does not exist.');
}

0 comments on commit 7cdbcce

Please sign in to comment.
You can’t perform that action at this time.