summaryrefslogtreecommitdiffstats
path: root/lib/private/server.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-11 14:15:24 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-11 14:15:24 +0100
commit8fd90e04b62c10a48ac15a3a52f7cd6b4040359d (patch)
tree853e78bf91a327d7062c1dd94b6e1eedaeec47a9 /lib/private/server.php
parent17d68e0638e65bdd5b59a68ffe366444723f5e8d (diff)
parent9ea205dc3dd27f6e2506a4867e29b12180251620 (diff)
downloadnextcloud-server-8fd90e04b62c10a48ac15a3a52f7cd6b4040359d.tar.gz
nextcloud-server-8fd90e04b62c10a48ac15a3a52f7cd6b4040359d.zip
Merge pull request #12781 from owncloud/jenkins-curl-open-basedir
[Jenkins only] curl open basedir
Diffstat (limited to 'lib/private/server.php')
-rw-r--r--lib/private/server.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index e0105506970..4107a0eeec8 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -2,6 +2,7 @@
namespace OC;
+use bantu\IniGetWrapper\IniGetWrapper;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
@@ -11,7 +12,6 @@ use OC\Diagnostics\EventLogger;
use OC\Diagnostics\QueryLogger;
use OC\Files\Config\StorageManager;
use OC\Security\CertificateManager;
-use OC\DB\ConnectionWrapper;
use OC\Files\Node\Root;
use OC\Files\View;
use OC\Security\Crypto;
@@ -285,6 +285,9 @@ class Server extends SimpleContainer implements IServerContainer {
$loader = \OC\Files\Filesystem::getLoader();
return new \OC\Files\Config\MountProviderCollection($loader);
});
+ $this->registerService('IniWrapper', function ($c) {
+ return new IniGetWrapper();
+ });
}
/**
@@ -723,4 +726,13 @@ class Server extends SimpleContainer implements IServerContainer {
function getMountProviderCollection(){
return $this->query('MountConfigManager');
}
+
+ /**
+ * Get the IniWrapper
+ *
+ * @return IniGetWrapper
+ */
+ public function getIniWrapper() {
+ return $this->query('IniWrapper');
+ }
}