From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 18 Sep 2013 12:25:12 +0000 (+0200)
Subject: Don't try to be clever
X-Git-Tag: v6.0.0alpha2~121^2~12^2~1^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2ef0b58ff6434254510c8be9c940126883022d76;p=nextcloud-server.git

Don't try to be clever
---

diff --git a/lib/server.php b/lib/server.php
index 6b1cb9c38d2..3454622425a 100644
--- a/lib/server.php
+++ b/lib/server.php
@@ -56,17 +56,6 @@ class Server extends SimpleContainer implements IServerContainer {
 			$view = new View();
 			return new Root($manager, $view, $user);
 		});
-		$this->registerService('CustomFolder', function($c) {
-			$dir = $c['CustomFolderPath'];
-			$root = $this->getRootFolder();
-			$folder = null;
-			if(!$root->nodeExists($dir)) {
-				$folder = $root->newFolder($dir);
-			} else {
-				$folder = $root->get($dir);
-			}
-			return $folder;
-		});
 	}
 
 	/**
@@ -112,8 +101,15 @@ class Server extends SimpleContainer implements IServerContainer {
 	 */
 	function getUserFolder() {
 
-		$this->registerParameter('CustomFolderPath', '/files');
-		return $this->query('CustomFolder');
+		$dir = '/files';
+		$root = $this->getRootFolder();
+		$folder = null;
+		if(!$root->nodeExists($dir)) {
+			$folder = $root->newFolder($dir);
+		} else {
+			$folder = $root->get($dir);
+		}
+		return $folder;
 
 	}
 
@@ -124,8 +120,15 @@ class Server extends SimpleContainer implements IServerContainer {
 	 */
 	function getAppFolder() {
 
-		$this->registerParameter('CustomFolderPath', '/' . \OC_App::getCurrentApp());
-		return $this->query('CustomFolder');
+		$dir = '/' . \OC_App::getCurrentApp();
+		$root = $this->getRootFolder();
+		$folder = null;
+		if(!$root->nodeExists($dir)) {
+			$folder = $root->newFolder($dir);
+		} else {
+			$folder = $root->get($dir);
+		}
+		return $folder;
 
 	}