Add way to disable emoji support

This commit is contained in:
Graham Campbell
2015-10-01 20:29:47 +01:00
parent 3e0d38aa4c
commit e8427cb06b
2 changed files with 6 additions and 5 deletions

View File

@@ -2,6 +2,7 @@ APP_ENV=production
APP_DEBUG=false APP_DEBUG=false
APP_URL=http://localhost APP_URL=http://localhost
APP_KEY=SomeRandomString APP_KEY=SomeRandomString
CACHET_EMOJI=false
DB_DRIVER=mysql DB_DRIVER=mysql
DB_HOST=localhost DB_HOST=localhost

View File

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