diff options
Diffstat (limited to 'apps/federation')
| -rw-r--r-- | apps/federation/lib/BackgroundJob/GetSharedSecret.php | 2 | ||||
| -rw-r--r-- | apps/federation/lib/DbHandler.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php index 5e2f80c8a97..2a7d5ad8ef6 100644 --- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php @@ -130,7 +130,7 @@ class GetSharedSecret extends Job{ * @param JobList $jobList * @param ILogger $logger */ - protected function parentExecute($jobList, $logger) { + protected function parentExecute($jobList, $logger = null) { parent::execute($jobList, $logger); } diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php index 015a06c035c..5cfbc9f021a 100644 --- a/apps/federation/lib/DbHandler.php +++ b/apps/federation/lib/DbHandler.php @@ -43,7 +43,7 @@ class DbHandler { private $connection; /** @var IL10N */ - private $l; + private $IL10N; /** @var string */ private $dbTable = 'trusted_servers'; @@ -87,7 +87,7 @@ class DbHandler { return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable); } else { $message = 'Internal failure, Could not add ownCloud as trusted server: ' . $url; - $message_t = $this->l->t('Could not add server'); + $message_t = $this->IL10N->t('Could not add server'); throw new HintException($message, $message_t); } } |