From 5cf9e792644733df63f48b3aab8a7a17be50f9dc Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Thu, 24 Mar 2022 10:27:35 -0600
Subject: [PATCH] version check for loading compatibility functions
---
install/lib/install.lib.php | 4 +++-
interface/lib/app.inc.php | 4 +++-
server/lib/app.inc.php | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 88021a8881..d9b482a842 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -29,7 +29,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
error_reporting(E_ALL|E_STRICT);
-require_once 'compatibility.inc.php';
+if(version_compare(phpversion(), '7.0', '<')) {
+ require_once 'compatibility.inc.php';
+}
$FILE = realpath('../install.php');
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 7ff158fbdc..96e8a1ddef 100755
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -28,7 +28,9 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once 'compatibility.inc.php';
+if(version_compare(phpversion(), '7.0', '<')) {
+ require_once 'compatibility.inc.php';
+}
//* Enable gzip compression for the interface
ob_start('ob_gzhandler');
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index a2e2dcf19b..ffd20e9fb6 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -27,7 +27,9 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once 'compatibility.inc.php';
+if(version_compare(phpversion(), '7.0', '<')) {
+ require_once 'compatibility.inc.php';
+}
// Set timezone
if(isset($conf['timezone']) && $conf['timezone'] != '') { // note: !empty($conf['timezone']) should give the same result and is more idiomatic for current versions of PHP (gwyneth 20220315)
--
GitLab