From 44aca5ad1b5c958bd4ddebf71b94d5e6ac03a8d5 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 5 Sep 2014 22:07:26 +0100 Subject: [PATCH] Need to use array_replace_recursive() This is the function needed to overwrite $text array ontop of $englishText, including nested arrays --- lib/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/settings.php b/lib/settings.php index 3d7e808..e092985 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -45,7 +45,7 @@ include(dirname(__FILE__)."/../lang/english.php"); $englishText = $text; // Load chosen language ontop to replace English include(dirname(__FILE__)."/../lang/english.php"); -$text = array_merge($englishText, $text); +$text = array_replace_recursive ($englishText, $text); $_SESSION['text'] = $text; // Login not required or we're in demo mode and have password set in our settings, log us straight in