From 327daa65d347ef3417c97f03dd488a5da2122eff Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 1 Jun 2018 16:05:37 +0200
Subject: [PATCH] Revert changes
#564 has proven to be enough to accomodate Windows installs
---
lib/_autoload.php | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/lib/_autoload.php b/lib/_autoload.php
index 7f96e6660..018468b55 100644
--- a/lib/_autoload.php
+++ b/lib/_autoload.php
@@ -8,15 +8,13 @@
* @package SimpleSAMLphp
*/
+// SSP is loaded as a separate project
if (file_exists(dirname(dirname(__FILE__)).'/vendor/autoload.php')) {
- // SSP is loaded as a separate project
require_once dirname(dirname(__FILE__)).'/vendor/autoload.php';
-} else if (file_exists(dirname(dirname(__FILE__)).'/../../autoload.php')) {
- // SSP is loaded as a library
- require_once dirname(dirname(__FILE__)).'/../../autoload.php';
-} else if (file_exists('/../../autoload.php')) {
- // Windows version
- require_once '/../../autoload.php';
-} else {
- throw new Exception('Unable to load Composer autoloader');
+} else { // SSP is loaded as a library
+ if (file_exists(dirname(dirname(__FILE__)).'/../../autoload.php')) {
+ require_once dirname(dirname(__FILE__)).'/../../autoload.php';
+ } else {
+ throw new Exception('Unable to load Composer autoloader');
+ }
}
--
GitLab