Merge pull request #965 from cachethq/emoji

Add way to disable emoji support
This commit is contained in:
Graham Campbell
2015-10-01 20:32:08 +01:00
2 changed files with 6 additions and 5 deletions

View File

@@ -12,6 +12,7 @@ DB_PASSWORD=secret
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=database
CACHET_EMOJI=false
MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io

View File

@@ -117,7 +117,7 @@ return [
|
*/
'providers' => [
'providers' => array_filter([
/*
* Laravel Framework Service Providers...
@@ -149,7 +149,7 @@ return [
/*
* Packages Service Providers...
*/
'AltThree\Emoji\EmojiServiceProvider',
env('CACHET_EMOJI', false) ? 'AltThree\Emoji\EmojiServiceProvider' : null,
'Barryvdh\Cors\CorsServiceProvider',
'Fideloper\Proxy\TrustedProxyServiceProvider',
'GrahamCampbell\Binput\BinputServiceProvider',
@@ -173,7 +173,7 @@ return [
'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
'CachetHQ\Cachet\Providers\RouteServiceProvider',
],
]),
/*
|--------------------------------------------------------------------------
@@ -221,8 +221,8 @@ return [
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
'Setting' => 'CachetHQ\Cachet\Facades\Setting',
'Str' => 'Illuminate\Support\Str',
'Setting' => 'CachetHQ\Cachet\Facades\Setting',
'Str' => 'Illuminate\Support\Str',
],