From 5a53bf04a1779cf0b0bc6c888efe596b1c2b87e2 Mon Sep 17 00:00:00 2001
From: Brendan Heywood <brendan@catalyst-au.net>
Date: Fri, 19 Jun 2020 09:17:39 +1000
Subject: [PATCH 1/2] Fixed bug with moodles under a subdir #196

---
 bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.php b/bootstrap.php
index 50dbf40..b06e11a 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -71,7 +71,7 @@ if (!empty($_SERVER['REQUEST_URI'])) {
     $rooturl = parse_url($CFG->wwwroot);
     $path = '';
     if (array_key_exists('path', $rooturl) && !empty($rooturl['path'])) {
-        $path = $root['url'];
+        $path = $rooturl['url'];
     }
     $url = $path.'/auth/outage/info.php';
     $outageinfo = strpos($_SERVER['REQUEST_URI'], $url) === 0 ? true : false;

From 32412c25800da85d72aeba254bf40ba0651bfd97 Mon Sep 17 00:00:00 2001
From: Brendan Heywood <brendan@catalyst-au.net>
Date: Fri, 19 Jun 2020 09:51:27 +1000
Subject: [PATCH 2/2] Fixed travis node issue

---
 .travis.yml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ff61a9..c13e5f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,29 +20,23 @@ php:
  - 7.2
 
 env:
-  - DB=pgsql MOODLE_BRANCH=master
+  - DB=pgsql  MOODLE_BRANCH=MOODLE_36_STABLE NODEJS=8
+  - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE NODEJS=8
+  - DB=pgsql  MOODLE_BRANCH=MOODLE_37_STABLE
+  - DB=pgsql  MOODLE_BRANCH=MOODLE_38_STABLE
+  - DB=pgsql  MOODLE_BRANCH=MOODLE_39_STABLE
+  - DB=mysqli MOODLE_BRANCH=MOODLE_39_STABLE
+  - DB=pgsql  MOODLE_BRANCH=master
   - DB=mysqli MOODLE_BRANCH=master
-  - DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
-  - DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
-  - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
-  - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
-  - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE
-  - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE
 
 matrix:
   include:
-    - php: 7.1
-      env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
-    - php: 7.1
+    - php: 5.6
+      env: DB=pgsql  MOODLE_BRANCH=MOODLE_33_STABLE NODEJS=8
+    - php: 7.0
       env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-    - php: 7.0
-      env: DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
-    - php: 7.0
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
-    - php: 5.6
-      env: DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 5.6
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE
+    - php: 7.1
+      env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE NODEJS=8
 
 before_install:
   - export MOODLE_VERSION=$(echo "$MOODLE_BRANCH" | cut -d'_' -f 2)
@@ -51,8 +45,13 @@ before_install:
       sudo /etc/init.d/postgresql start 9.5;
     fi
   - phpenv config-rm xdebug.ini
-  - nvm install 8.9
-  - nvm use 8.9
+  - if [ "$NODEJS" = 8 ]; then
+      nvm install 8.9;
+      nvm use 8.9;
+    else
+      nvm install 14.0.0;
+      nvm use 14.0.0;
+    fi
   - cd ../..
   - composer selfupdate
   - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
@@ -74,4 +73,4 @@ script:
 # Behat tests are failing due to issue:
 # https://github.com/blackboard-open-source/moodle-plugin-ci/issues/70
 # Commenting it out until the issue is fixed.
-# - moodle-plugin-ci behat
\ No newline at end of file
+# - moodle-plugin-ci behat