diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-05-06 08:55:46 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2015-05-06 08:55:46 +0200 |
| commit | 4c0d1b0460d3ab4f6d37562a88a27cff680d41c6 (patch) | |
| tree | f87f33c0635688a7cb96d9262236c4ee4cf12105 /lib | |
| parent | 910146824e015b8e1ab1069275cbfc5cfed02663 (diff) | |
| parent | 11310355ede2f91ba9bff7e444045defd37c8779 (diff) | |
| download | nextcloud-server-4c0d1b0460d3ab4f6d37562a88a27cff680d41c6.tar.gz nextcloud-server-4c0d1b0460d3ab4f6d37562a88a27cff680d41c6.zip | |
Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-data
Don't display errors and log them
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 8 | ||||
| -rw-r--r-- | lib/private/util.php | 19 |
2 files changed, 3 insertions, 24 deletions
diff --git a/lib/base.php b/lib/base.php index d22385c86df..86620ff95a7 100644 --- a/lib/base.php +++ b/lib/base.php @@ -542,12 +542,10 @@ class OC { \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd); \OC::$server->getEventLogger()->start('boot', 'Initialize'); - // set some stuff - //ob_start(); + // Don't display errors and log them error_reporting(E_ALL | E_STRICT); - if (defined('DEBUG') && DEBUG) { - ini_set('display_errors', 1); - } + @ini_set('display_errors', 0); + @ini_set('log_errors', 1); date_default_timezone_set('UTC'); diff --git a/lib/private/util.php b/lib/private/util.php index f8776c2c861..367199f7735 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -754,25 +754,6 @@ class OC_Util { ); } - /** - * PHP 5.6 ships with a PHP setting which throws notices by default for a - * lot of endpoints. Thus we need to ensure that the value is set to -1 - * - * FIXME: Due to https://github.com/owncloud/core/pull/13593#issuecomment-71178078 - * this check is disabled for HHVM at the moment. This should get re-evaluated - * at a later point. - * - * @link https://github.com/owncloud/core/issues/13592 - */ - if(version_compare(phpversion(), '5.6.0', '>=') && - !self::runningOnHhvm() && - \OC::$server->getIniWrapper()->getNumeric('always_populate_raw_post_data') !== -1) { - $errors[] = array( - 'error' => $l->t('PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code.'), - 'hint' => $l->t('To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini') - ); - } - if (!self::isAnnotationsWorking()) { $errors[] = array( 'error' => $l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.'), |