summaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2018-10-12 11:14:51 +0100
committerGreg Roach <fisharebest@webtrees.net>2018-10-12 11:15:32 +0100
commit61e75590194f40b4cbab695351cc33225c03ab70 (patch)
treef8d2dd2fd5f45b325cea2606e616a2efc78e4c11 /index.php
parentdd6b2bfcc550270bb6d6778e11576148f71e4330 (diff)
downloadwebtrees-61e75590194f40b4cbab695351cc33225c03ab70.tar.gz
webtrees-61e75590194f40b4cbab695351cc33225c03ab70.tar.bz2
webtrees-61e75590194f40b4cbab695351cc33225c03ab70.zip
Fix potential conflict with PHP's Locale class
Diffstat (limited to 'index.php')
-rw-r--r--index.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/index.php b/index.php
index 5bc410938f..7fd76f9fad 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@
*/
declare(strict_types=1);
-use Fisharebest\Localization\Locale;
+use Fisharebest\Localization\Locale as WebtreesLocale;
use Fisharebest\Localization\Locale\LocaleInterface;
use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Database;
@@ -252,7 +252,7 @@ try {
$resolver->bind(Resolver::class, $resolver);
$resolver->bind(Tree::class, $tree);
$resolver->bind(User::class, Auth::user());
- $resolver->bind(LocaleInterface::class, Locale::create(WT_LOCALE));
+ $resolver->bind(LocaleInterface::class, WebtreesLocale::create(WT_LOCALE));
$resolver->bind(TimeoutService::class, new TimeoutService(microtime(true)));
$resolver->bind(Filesystem::class, new Filesystem(new Local(WT_DATA_DIR)));