diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-04 15:39:32 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-04 15:39:32 +0200 |
| commit | ba998670333b5430cd00dbce82a44f831ef34da1 (patch) | |
| tree | 9186d993f5faff210e8723132869d6c3563a2b79 | |
| parent | 873849e8436b9a502038742ed7c1744e7954082b (diff) | |
| parent | 3ff314c6f26166e01fe6c561e411f8dc3a429b68 (diff) | |
| download | nextcloud-server-ba998670333b5430cd00dbce82a44f831ef34da1.tar.gz nextcloud-server-ba998670333b5430cd00dbce82a44f831ef34da1.zip | |
Merge pull request #24435 from owncloud/fix-log-usage
Fix usages of OC\Log\Owncloud
| -rw-r--r-- | settings/Controller/LogSettingsController.php | 4 | ||||
| -rw-r--r-- | settings/admin.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index 70a2b752359..9d8817c9e62 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -89,8 +89,8 @@ class LogSettingsController extends Controller { */ public function getEntries($count=50, $offset=0) { return new JSONResponse([ - 'data' => \OC_Log_Owncloud::getEntries($count, $offset), - 'remain' => count(\OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0, + 'data' => \OC\Log\Owncloud::getEntries($count, $offset), + 'remain' => count(\OC\Log\Owncloud::getEntries(1, $offset + $count)) !== 0, ]); } diff --git a/settings/admin.php b/settings/admin.php index b67331b22eb..309454c927a 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -44,15 +44,16 @@ OC_Util::addScript('files', 'jquery.fileupload'); $showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud'); $numEntriesToLoad = 3; -$entries = OC_Log_Owncloud::getEntries($numEntriesToLoad + 1); +$entries = \OC\Log\Owncloud::getEntries($numEntriesToLoad + 1); $entriesRemaining = count($entries) > $numEntriesToLoad; $entries = array_slice($entries, 0, $numEntriesToLoad); -$logFilePath = OC_Log_Owncloud::getLogFilePath(); +$logFilePath = \OC\Log\Owncloud::getLogFilePath(); $doesLogFileExist = file_exists($logFilePath); $logFileSize = 0; if($doesLogFileExist) { $logFileSize = filesize($logFilePath); } + $config = \OC::$server->getConfig(); $appConfig = \OC::$server->getAppConfig(); $request = \OC::$server->getRequest(); |