diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-27 12:12:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 12:12:10 +0300 |
| commit | cd8c762a3df4440e69c8fce1d407ef62f6f185a7 (patch) | |
| tree | 7a269aa6c7f47dfe0288ea73778cd0a9418638bb /libs | |
| parent | 3ce6d87aa1e8d772fb727413346f8e7426c38706 (diff) | |
When safe mode is displayed, and Super User was not logged in already, let Super User display the full safe mode to troubleshoot further (#11082)
* When safe mode is displayed, and Super User was not logged in already, let Super User display the full safe mode to troubleshoot further
* meant for a different PR
* Catch exceptions during CSS/Less compiling
* when there's an error during Twig template processing, or during LESS css compiling, display the safe mode
* Deactivate plugin as super user when authenticated with i_am_super_user
* when user is not logged as Super User, Make deactivate plugin work by forwarding the i_am_super_user URL parameter
* Display plugin version in safe mode fixes https://github.com/piwik/piwik/issues/11043
* Added a text to indicate users to first disable third party plugins
* Updated UI test
* clarify that salt is a secret
* reuse helper method
* minor
* Catching PHP7 errors and making it work on php5
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/upgradephp/upgrade.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php index c6591b70a9..8c29af7c3a 100644 --- a/libs/upgradephp/upgrade.php +++ b/libs/upgradephp/upgrade.php @@ -702,3 +702,12 @@ if (!function_exists('dump')) { } } + +/** + * Need to catch that PHP7 error object on php5 + */ +if( !class_exists('\Error')) { + class Error { + + } +}
\ No newline at end of file |