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

Use more precise regex to prevent some translations being compiled unnecessarily

Browse Source
This commit is contained in:
Toby Zerner
2016-03-29 17:31:13 +10:30
parent ebde47fe3b
commit 36cf744e2a
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Admin/Controller/ClientController.php
View File

@@ -32,7 +32,7 @@ class ClientController extends BaseClientController
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $translations = '/[^\.]\.(admin|lib)\.*+/'; protected $translations = '/^[^\.]+\.(?:admin|lib)\./';
/** /**
* @var ExtensionManager * @var ExtensionManager

2
framework/core/src/Forum/Controller/ClientController.php
View File

@@ -29,7 +29,7 @@ class ClientController extends AbstractClientController
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $translations = '/[^\.]\.(forum|lib)\.*+/'; protected $translations = '/^[^\.]+\.(?:forum|lib)\./';
/** /**
* @var Formatter * @var Formatter

4
framework/core/src/Http/Controller/AbstractClientController.php
View File

@@ -308,9 +308,7 @@ abstract class AbstractClientController extends AbstractHtmlController
} }
$filtered = array_filter(array_keys($translations), function ($id) { $filtered = array_filter(array_keys($translations), function ($id) {
if (preg_match($this->translations, $id)) { return preg_match($this->translations, $id);
return true;
}
}); });
return array_only($translations, $filtered); return array_only($translations, $filtered);