From 5d1623a0832f136b91cdc1b47df24a175cd3828b Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Tue, 21 May 2019 09:04:26 +0000 Subject: [PATCH] Use PHP functions --- lib/Settings/SettingsController.php | 4 ++-- lib/WP/Functions.php | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Settings/SettingsController.php b/lib/Settings/SettingsController.php index 40d131e98b..3390a27ac9 100644 --- a/lib/Settings/SettingsController.php +++ b/lib/Settings/SettingsController.php @@ -35,7 +35,7 @@ class SettingsController { } } if (is_array($setting) && is_array($default)) { - return WPFunctions::get()->arrayReplaceRecursive($default, $setting); + return array_replace_recursive($default, $setting); } return $setting; } @@ -85,7 +85,7 @@ class SettingsController { function getAll() { $this->ensureLoaded(); - return WPFunctions::get()->arrayReplaceRecursive($this->getAllDefaults(), self::$settings); + return array_replace_recursive($this->getAllDefaults(), self::$settings); } function set($key, $value) { diff --git a/lib/WP/Functions.php b/lib/WP/Functions.php index 99bea58eaf..49a5993eda 100644 --- a/lib/WP/Functions.php +++ b/lib/WP/Functions.php @@ -105,10 +105,6 @@ class Functions { return admin_url($path, $scheme); } - function arrayReplaceRecursive(array $base = [], array $replacements = []) { - return array_replace_recursive($base, $replacements); - } - function currentFilter() { return current_filter(); }