Skip to content

Commit

Permalink
Support alternative matomo bootstrap file (#14887)
Browse files Browse the repository at this point in the history
* support configuration of a matomo bootstrap file

* load matomo bootstrap only as fallback
  • Loading branch information
tsteur authored and diosmosis committed Sep 16, 2019
1 parent eb135d8 commit 5bb2cda
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions console
Expand Up @@ -6,6 +6,8 @@ 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')) {
Expand Down
2 changes: 2 additions & 0 deletions index.php
Expand Up @@ -13,6 +13,8 @@
}
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);
Expand Down
2 changes: 2 additions & 0 deletions piwik.php
Expand Up @@ -24,6 +24,8 @@
}
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);
Expand Down

0 comments on commit 5bb2cda

Please sign in to comment.