mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-16 21:34:08 +02:00
Code Issues Releases Wiki Activity

merged api tests into branch

Browse Source
This commit is contained in:
Daniel Klabbers
2018-05-16 09:27:01 +02:00
parent 3e3e1cbde5 e226f81515
commit 30358e98c0
6 changed files with 180 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discussion/DiscussionPolicy.php
View File

@@ -11,7 +11,6 @@
namespace Flarum\Discussion;
use Carbon\Carbon;
use Flarum\Event\ScopeModelVisibility;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AbstractPolicy;
@@ -129,7 +128,7 @@ class DiscussionPolicy extends AbstractPolicy
if ($allowRenaming === '-1'
|| ($allowRenaming === 'reply' && $discussion->participant_count <= 1)
|| ($discussion->created_at->diffInMinutes(new Carbon) < $allowRenaming)) {
|| ($discussion->created_at->diffInMinutes() < $allowRenaming)) {
return true;
}
}

4
src/Formatter/Formatter.php
View File

@@ -117,10 +117,10 @@ class Formatter
$configurator->Autolink;
$configurator->tags->onDuplicate('replace');
$this->events->dispatch(new Configuring($configurator));
$this->configureExternalLinks($configurator);
$this->events->dispatch(new Configuring($configurator));
return $configurator;
}