Merge branch 'master' into more-themable-strings

Conflicts:
	lib/template.php

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 3d7d5abf8fe..d6ebe7d629a 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -8,7 +8,7 @@
 
 /**
  * Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
+ * This class won't call any filesystem functions for itself but will pass them to the correct OC_Filestorage object
  * this class should also handle all the file permission related stuff
  *
  * Hooks provided:
@@ -148,13 +148,20 @@ class Filesystem {
 	 */
 	private static $loader;
 
-	public static function getLoader(){
+	public static function getLoader() {
 		if (!self::$loader) {
 			self::$loader = new Loader();
 		}
 		return self::$loader;
 	}
 
+	public static function getMountManager() {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		return self::$mounts;
+	}
+
 	/**
 	 * get the mountpoint of the storage object for a path
 	 * ( note: because a storage is not always mounted inside the fakeroot, the
@@ -717,7 +724,7 @@ class Filesystem {
 	/**
 	 * Get the path of a file by id
 	 *
-	 * Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
+	 * Note that the resulting path is not guaranteed to be unique for the id, multiple paths can point to the same file
 	 *
 	 * @param int $id
 	 * @return string