Reset modules array keys [close #12]

SeptdirWorkshop · May 17, 2019 · 2eb2308 · 2eb2308
1 parent 4cc0e6b
commit 2eb2308
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/jyproextra.php b/jyproextra.php
@@ -445,22 +445,31 @@ public function onAfterCleanModuleList(&$modules)
 		$app = Factory::getApplication();
 		if ($app->isClient('site') && $app->getTemplate() === 'yootheme' && !empty($modules))
 		{
+			$resetKeys = false;
 			foreach ($modules as $key => $module)
 			{
 				$params = new Registry($module->params);
 
 				// Unset in customizer
 				if ($params->get('unset_customizer') && $app->input->get('customizer'))
 				{
+					$resetKeys = true;
 					unset($modules[$key]);
 				}
 
 				// Hide empty content modules
 				elseif ($params->get('unset_empty') && !$content = ModuleHelper::renderModule($module))
 				{
+					$resetKeys = true;
 					unset($modules[$key]);
 				}
 			}
+
+			// Reset modules array keys
+			if ($resetKeys)
+			{
+				$modules = array_values($modules);
+			}
 		}
 	}
 }