diff options
| -rw-r--r-- | lib/public/util.php | 6 | ||||
| -rw-r--r-- | tests/bootstrap.php | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/public/util.php b/lib/public/util.php index 76f0ea24b46..06ad5de60ca 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -78,7 +78,7 @@ class Util { public static function setChannel($channel) { //Flush timestamp to reload version.php \OC::$server->getSession()->set('OC_Version_Timestamp', 0); - return \OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel); + \OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel); } /** @@ -148,8 +148,8 @@ class Util { * @since 4.0.0 */ public static function writeLog( $app, $message, $level ) { - // call the internal log class - \OCP\Util::writeLog( $app, $message, $level ); + $context = ['app' => $app]; + \OC::$server->getLogger()->log($level, $message, $context); } /** diff --git a/tests/bootstrap.php b/tests/bootstrap.php index e4ba135b599..bd94ca67754 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -17,4 +17,3 @@ if (!class_exists('PHPUnit_Framework_TestCase')) { } OC_Hook::clear(); -\OCP\Util::$enabled = false; |