From db4e0f2285dc2ef7cab638a48a1a2e505e4674c4 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Mon, 4 Nov 2019 13:52:10 +1300
Subject: [PATCH] Revert "Support alternative matomo bootstrap file (#14887)"
 (#15075)

This reverts commit 5bb2cdaab831831f0e927de7857937230ca15b30.
---
 console   | 2 --
 index.php | 2 --
 piwik.php | 2 --
 3 files changed, 6 deletions(-)

diff --git a/console b/console
index 75a37bef5c9..47b8ba59f98 100755
--- a/console
+++ b/console
@@ -6,8 +6,6 @@ if (!defined('PIWIK_DOCUMENT_ROOT')) {
 
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
-} elseif (file_exists(PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php')) {
-    require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
 }
 
 if (!defined('PIWIK_INCLUDE_PATH')) {
diff --git a/index.php b/index.php
index 184a785f81d..8e3b2cb64a6 100644
--- a/index.php
+++ b/index.php
@@ -13,8 +13,6 @@
 }
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
-} elseif (file_exists(PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php')) {
-    require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
 }
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
diff --git a/piwik.php b/piwik.php
index 7fad7805b6d..90c4412fb14 100644
--- a/piwik.php
+++ b/piwik.php
@@ -24,8 +24,6 @@
 }
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
-} elseif (file_exists(PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php')) {
-    require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
 }
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);