Merge pull request #12803 from jeabakker/apache-stats

fix(admin): prevent fatal error on non Apache servers
Elgg · Aug 28, 2019 · fe1f1ed · fe1f1ed
2 parents 719b7b0 + 3da3034
commit fe1f1ed
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/views/default/admin/performance/generic.php b/views/default/admin/performance/generic.php
@@ -26,19 +26,22 @@
 };
 
 // apache version
-if (apache_get_version() !== false) {
-	$icon =  $icon_warning;
-	$title = elgg_echo('admin:performance:apache:mod_cache');
-	$value = elgg_echo('status:unavailable');
-	$subtext = '';
-
-	if (in_array('mod_cache', apache_get_modules())) {
-		$value = elgg_echo('status:enabled');
-	} else {
-		$subtext = elgg_echo('admin:performance:apache:mod_cache:warning');
+// Check if the function exists before callling it else it may fail in case of Nginx or other Non Apache servers
+if (function_exists('apache_get_version')) {
+	if (apache_get_version() !== false) {
+		$icon =  $icon_warning;
+		$title = elgg_echo('admin:performance:apache:mod_cache');
+		$value = elgg_echo('status:unavailable');
+		$subtext = '';
+
+		if (in_array('mod_cache', apache_get_modules())) {
+			$value = elgg_echo('status:enabled');
+		} else {
+			$subtext = elgg_echo('admin:performance:apache:mod_cache:warning');
+		}
+
+		echo $view_module($icon, $title, $value, $subtext);
 	}
-
-	echo $view_module($icon, $title, $value, $subtext);
 }
 
 // open_basedir