Skip to content
Permalink
Browse files

Merge branch 'release-1.0'

  • Loading branch information...
corpsee committed May 12, 2019
2 parents 3c752d5 + b84498f commit a0280123b742d1f95bf9d380e6ffb38596e72a49
Showing with 30 additions and 11 deletions.
  1. +14 −0 CHANGELOG.md
  2. +1 −1 VERSION.md
  3. +8 −8 composer.lock
  4. +1 −1 src/Command/InstallCommand.php
  5. +6 −1 src/View/exception.phtml
@@ -5,6 +5,20 @@ 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.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.

### Changed

- Improved default value of installation URL for support both http-protocols (`http` and `https`). Issue
[#303](https://github.com/php-censor/php-censor/issues/303).


## [1.0.8 (Morty Smith)](https://github.com/php-censor/php-censor/tree/1.0.8) (2019-04-26)

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

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -247,7 +247,7 @@ protected function getConfigInformation(InputInterface $input, OutputInterface $
if ($url = $input->getOption('url')) {
$url = $urlValidator($url);
} else {
$question = new Question('Enter your application URL (default: "http://php-censor.local"): ', 'http://php-censor.local');
$question = new Question('Enter your application URL (default: "//php-censor.local"): ', '//php-censor.local');
$question->setValidator($urlValidator);
$url = $helper->ask($input, $output, $question);
}
@@ -4,13 +4,18 @@
* @var $exception \Exception
*/
use PHPCensor\Model\User;
/** @var User $user */
$user = $this->getUser();
?>
<div class="panel panel-danger">
<div class="box-header">
<h2 class="box-title">Sorry, there was a problem</h2>
</div>

<?php if ($this->getUser()->getIsAdmin()): ?>
<?php if ($user && $user->getIsAdmin()): ?>
<div class="box-body">
<strong>Message</strong>: <?= $exception->getMessage(); ?><br />
<strong>File</strong>: <?= $exception->getFile(); ?><br />

0 comments on commit a028012

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