diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
| commit | 5788d36c8d1e9869d8a645293805e3b0265ea238 (patch) | |
| tree | 80045c0eb1687652f956b3bdaccb1c765893d2e1 /lib/base.php | |
| parent | 84f3c8b6cc1060203d807ee65545478ce34f93c4 (diff) | |
| parent | 35bd7a400d30fb27703d4fa02b107f9629845b7d (diff) | |
| download | nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.tar.gz nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.zip | |
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index e195d305d5c..113cd569b2e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -402,9 +402,11 @@ class OC { self::initPaths(); - register_shutdown_function(array('OC_Log', 'onShutdown')); - set_error_handler(array('OC_Log', 'onError')); - set_exception_handler(array('OC_Log', 'onException')); + if (!defined('PHPUNIT_RUN')) { + register_shutdown_function(array('OC_Log', 'onShutdown')); + set_error_handler(array('OC_Log', 'onError')); + set_exception_handler(array('OC_Log', 'onException')); + } // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { |