From 534b3d9bb05c52133e16d704278af53132d42af6 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina Mena <marco.antonio.nina@processmaker.com>
Date: Fri, 19 Jan 2018 16:32:35 -0400
Subject: [PATCH] Fix CR

---
 workflow/engine/controllers/adminProxy.php       | 2 +-
 workflow/engine/src/ProcessMaker/Core/System.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 43ebb61f2..c7186746b 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -1439,7 +1439,7 @@ class adminProxy extends HttpProxyController
         //PHP Version
         $params['php'] = $systemInfo->php->version;
 
-        //Apache - nginx IIS Version
+        //Apache - nginx - IIS Version
 
         $params['serverSoftwareVersion'] = System::getServerVersion();
 
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index abbbea16c..1cee76cae 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -1299,10 +1299,10 @@ class System
      */
     public static function getServerVersion()
     {
-        $serverVersion = '';
+        $serverVersion = 'Undetermined';
 
         if (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
-            $serverVersion = apache_get_version();
+            $serverVersion = function_exists('apache_get_version') ? apache_get_version() : $_SERVER['SERVER_SOFTWARE'];
         }
 
         if (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) {