From 983478aeec8f9c9ee29e308cccd2ba8ff0708a2c Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Fri, 16 Jul 2021 18:31:30 +0100 Subject: [PATCH] [PEAR] Force using extlib's patched version --- lib/util/framework.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/util/framework.php b/lib/util/framework.php index 841c242427..bfa8ba01f8 100644 --- a/lib/util/framework.php +++ b/lib/util/framework.php @@ -89,15 +89,16 @@ set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/'); // global configuration object -require_once 'PEAR.php'; -require_once 'PEAR/Exception.php'; +// This is awful but system's PEAR always gives us issues, we've patched it +require_once INSTALLDIR . '/extlib/' . 'PEAR.php'; +require_once INSTALLDIR . '/extlib/' . 'PEAR/Exception.php'; global $_PEAR; $_PEAR = new PEAR; $_PEAR->setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception'); -require_once 'MDB2.php'; -require_once 'DB/DataObject.php'; -require_once 'DB/DataObject/Cast.php'; // for dates +require_once INSTALLDIR . '/extlib/' . 'MDB2.php'; +require_once INSTALLDIR . '/extlib/' . 'DB/DataObject.php'; +require_once INSTALLDIR . '/extlib/' . 'DB/DataObject/Cast.php'; // for dates require_once INSTALLDIR . '/lib/util/language.php';