Fix includeOriginals option not working without namespace

FriendsOfFlarum · Mar 9, 2021 · c4dd6a6 · c4dd6a6
1 parent b48a537
commit c4dd6a6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Api/Controllers/ExportController.php b/src/Api/Controllers/ExportController.php
@@ -54,9 +54,13 @@ public function handle(ServerRequestInterface $request): ResponseInterface
              */
             $catalogue = app('translator')->getCatalogue($locale);
 
-            $originals = array_filter($catalogue->all('messages'), function ($key) use ($namespace) {
-                return Str::startsWith($key, $namespace . '.');
-            }, ARRAY_FILTER_USE_KEY);
+            $originals = $catalogue->all('messages');
+
+            if ($namespace) {
+                $originals = array_filter($originals, function ($key) use ($namespace) {
+                    return Str::startsWith($key, $namespace . '.');
+                }, ARRAY_FILTER_USE_KEY);
+            }
 
             // Complete base with original translations if they are not customized
             $translations = collect($originals)->merge($translations);