From 0b3a4264a34fe91568a165073a81e4e6791ea776 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 29 Mar 2016 17:31:13 +1030
Subject: [PATCH] Use more precise regex to prevent some translations being
 compiled unnecessarily

---
 src/Admin/Controller/ClientController.php        | 2 +-
 src/Forum/Controller/ClientController.php        | 2 +-
 src/Http/Controller/AbstractClientController.php | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Admin/Controller/ClientController.php b/src/Admin/Controller/ClientController.php
index d91818ae5..df8ce812e 100644
--- a/src/Admin/Controller/ClientController.php
+++ b/src/Admin/Controller/ClientController.php
@@ -32,7 +32,7 @@ class ClientController extends BaseClientController
     /**
      * {@inheritdoc}
      */
-    protected $translations = '/[^\.]\.(admin|lib)\.*+/';
+    protected $translations = '/^[^\.]+\.(?:admin|lib)\./';
 
     /**
      * @var ExtensionManager
diff --git a/src/Forum/Controller/ClientController.php b/src/Forum/Controller/ClientController.php
index 9d7707080..08056be1e 100644
--- a/src/Forum/Controller/ClientController.php
+++ b/src/Forum/Controller/ClientController.php
@@ -29,7 +29,7 @@ class ClientController extends AbstractClientController
     /**
      * {@inheritdoc}
      */
-    protected $translations = '/[^\.]\.(forum|lib)\.*+/';
+    protected $translations = '/^[^\.]+\.(?:forum|lib)\./';
 
     /**
      * @var Formatter
diff --git a/src/Http/Controller/AbstractClientController.php b/src/Http/Controller/AbstractClientController.php
index 87d8e6a31..a11442793 100644
--- a/src/Http/Controller/AbstractClientController.php
+++ b/src/Http/Controller/AbstractClientController.php
@@ -308,9 +308,7 @@ abstract class AbstractClientController extends AbstractHtmlController
         }
 
         $filtered = array_filter(array_keys($translations), function ($id) {
-            if (preg_match($this->translations, $id)) {
-                return true;
-            }
+            return preg_match($this->translations, $id);
         });
 
         return array_only($translations, $filtered);