//// Merge -> revision 8290

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-01 09:53:43 +00:00
parent d27c0b3b7d
commit c2258ae8e9
50 changed files with 431 additions and 256 deletions
@@ -1128,9 +1128,10 @@ class AdminUpgrade extends AdminPreferences
 	{
 		static $apacheModuleList = null;

-		if (!is_array($apacheModuleList))
+		if (!is_array($apacheModuleList) AND function_exists('apache_get_modules'))
+		{
 			$apacheModuleList = apache_get_modules();
-
+		}
 		// we need strpos (example can be evasive20
 		foreach($apacheModuleList as $module)
 			if (strpos($name, $module)!==false)