fix loading logs in oc9.1

icewind1991 · icewind1991 · commit 52d8473b06a1 · 2016-05-23T17:21:23.000+02:00
diff --git a/controller/logcontroller.php b/controller/logcontroller.php
@@ -49,7 +49,8 @@ public function __construct($appName,
 
 	private function getLogIterator() {
 		$dateFormat = $this->config->getSystemValue('logdateformat', \DateTime::ISO8601);
-		$handle = fopen(\OC_Log_Owncloud::getLogFilePath(), 'rb');
+		$logClass = class_exists('\OC\Log\Owncloud') ? '\OC\Log\Owncloud' : '\OC_Log_Owncloud';
+		$handle = fopen($logClass::getLogFilePath(), 'rb');
 		return new LogIterator($handle, $dateFormat);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public function __construct($appName,`
`49`	`49`
`50`	`50`	`private function getLogIterator() {`
`51`	`51`	`$dateFormat = $this->config->getSystemValue('logdateformat', \DateTime::ISO8601);`
`52`		`- $handle = fopen(\OC_Log_Owncloud::getLogFilePath(), 'rb');`
	`52`	`+ $logClass = class_exists('\OC\Log\Owncloud') ? '\OC\Log\Owncloud' : '\OC_Log_Owncloud';`
	`53`	`+ $handle = fopen($logClass::getLogFilePath(), 'rb');`
`53`	`54`	`return new LogIterator($handle, $dateFormat);`
`54`	`55`	`}`
`55`	`56`