diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-01-08 07:33:12 -0800 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-01-08 07:33:12 -0800 |
| commit | 0e7283ef39d7fe2e80585c190d8e1dc2cb511c96 (patch) | |
| tree | b159baf8ab77d4f4c8f38af0c2e71e24bae6a156 | |
| parent | 0bc0a60a93d05f02ebac76850bf020fd5ef1bdd9 (diff) | |
| parent | e35bca1c266cbe1468da9b4a328e2521d00c30f2 (diff) | |
| download | nextcloud-server-0e7283ef39d7fe2e80585c190d8e1dc2cb511c96.tar.gz nextcloud-server-0e7283ef39d7fe2e80585c190d8e1dc2cb511c96.zip | |
Merge pull request #6686 from owncloud/fixes-6685-master
Fix ownCloud for php5.3.x
| -rw-r--r-- | lib/private/server.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 5977ee9b5a0..2cbd37a97d7 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -128,7 +128,8 @@ class Server extends SimpleContainer implements IServerContainer { return new \OC\L10N\Factory(); }); $this->registerService('URLGenerator', function($c) { - $config = $this->getConfig(); + /** @var $c SimpleContainer */ + $config = $c->query('AllConfig'); return new \OC\URLGenerator($config); }); $this->registerService('AppHelper', function($c) { |