From bedd4b8ffd48fc3939b7b1e10b78cbbb59dd49eb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 31 May 2018 19:12:04 +0200
Subject: [PATCH] Take care of Windows paths
Closes https://github.com/simplesamlphp/simplesamlphp/pull/782
---
lib/_autoload.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/_autoload.php b/lib/_autoload.php
index 018468b55..6e6a65c01 100644
--- a/lib/_autoload.php
+++ b/lib/_autoload.php
@@ -9,11 +9,13 @@
*/
// SSP is loaded as a separate project
-if (file_exists(dirname(dirname(__FILE__)).'/vendor/autoload.php')) {
- require_once dirname(dirname(__FILE__)).'/vendor/autoload.php';
+$libpath = \SimpleSAML\Utils\System::resolvePath(dirname(dirname(__FILE__)).'/vendor/autoload.php'));
+if (file_exists($prjpath) {
+ require_once $prjpath;
} else { // SSP is loaded as a library
- if (file_exists(dirname(dirname(__FILE__)).'/../../autoload.php')) {
- require_once dirname(dirname(__FILE__)).'/../../autoload.php';
+ $libpath = \SimpleSAML\Utils\System::resolvePath(dirname(dirname(__FILE__)).'/../../autoload.php'));
+ if (file_exists($libpath) {
+ require_once $libpath;
} else {
throw new Exception('Unable to load Composer autoloader');
}
--
GitLab