Revert "Support alternative matomo bootstrap file (matomo-org#14887)" (…

…matomo-org#15075) This reverts commit 5bb2cda.
alemonteiro · Nov 4, 2019 · db4e0f2 · db4e0f2
1 parent 7ba181b
commit db4e0f2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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);