SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-02 08:09:19 +08:00
Code Issues Projects Packages Activity Actions

Merge commit '114b895b6d' into merge_develop

Browse source 
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/include/CleanCSV.php
#	public/legacy/suitecrm_version.php
#	public/legacy/tests/unit/phpunit/includes/CleanCSVTest.php
This commit is contained in:
Dillon-Brown 2021-08-30 10:18:23 +01:00
commit 33fc2ee307
182 changed files with 1220 additions and 3898 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/legacy/modules/UpgradeWizard/uw_utils.php
View file

@ -3650,8 +3650,8 @@ function addNewSystemTabsFromUpgrade($from_dir)
$newTB = new TabController();
//make sure new modules list has a key we can reference directly
$newModuleList = $newTB->get_key_array($newModuleList);
$oldModuleList = $newTB->get_key_array($oldModuleList);
$newModuleList = TabController::get_key_array($newModuleList);
$oldModuleList = TabController::get_key_array($oldModuleList);
//iterate through list and remove commonalities to get new modules
foreach ($newModuleList as $remove_mod) {