From e8427cb06b2fe18e932d3702549e86d49e59d914 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 1 Oct 2015 20:29:47 +0100 Subject: [PATCH] Add way to disable emoji support --- .env.example | 1 + config/app.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index 9ef5bf75..f59d836b 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,7 @@ APP_ENV=production APP_DEBUG=false APP_URL=http://localhost APP_KEY=SomeRandomString +CACHET_EMOJI=false DB_DRIVER=mysql DB_HOST=localhost diff --git a/config/app.php b/config/app.php index 17d4c652..556ed61c 100644 --- a/config/app.php +++ b/config/app.php @@ -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', ],