From 9530e819eb4cc6355336cccbe8b6124cd4743581 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 5 May 2015 12:34:22 +0200
Subject: Don't display errors and log them

Fixes https://github.com/owncloud/core/issues/16014
---
 lib/base.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib')

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');
 
-- 
cgit v1.2.3


From 11310355ede2f91ba9bff7e444045defd37c8779 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 5 May 2015 12:36:15 +0200
Subject: Don't depend on always_populate_raw_post_data

---
 lib/private/util.php | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'lib')

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.'),
-- 
cgit v1.2.3