aboutsummaryrefslogtreecommitdiffstats
path: root/lib/util.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-10-13 04:29:20 +0200
committerRobin Appelman <icewind@owncloud.com>2012-10-13 04:29:20 +0200
commit11e9ce25e622ea3a98c8085717541620fb878a69 (patch)
tree4cc0563d51768efa01a92a7333f370a4d0ccf3d3 /lib/util.php
parent141ff806c6cfbd349ffa232502a89a620882c409 (diff)
parentd386bc8737374200b4dc8ca0b62e432757ac2f04 (diff)
downloadnextcloud-server-11e9ce25e622ea3a98c8085717541620fb878a69.tar.gz
nextcloud-server-11e9ce25e622ea3a98c8085717541620fb878a69.zip
merge master into filesystem
Diffstat (limited to 'lib/util.php')
-rwxr-xr-xlib/util.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index be56f7bda39..a787a79e52a 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,9 +1,9 @@
<?php
-
/**
* Class for utility functions
*
*/
+
class OC_Util {
public static $scripts=array();
public static $styles=array();
@@ -49,7 +49,9 @@ class OC_Util {
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $user_root), $user);
\OC\Files\Filesystem::init($user_dir);
$quotaProxy=new OC_FileProxy_Quota();
+ $fileOperationProxy = new OC_FileProxy_FileOperations();
OC_FileProxy::register($quotaProxy);
+ OC_FileProxy::register($fileOperationProxy);
// Load personal mount config
if (is_file($user_root.'/mount.php')) {
$mountConfig = include($user_root.'/mount.php');