summaryrefslogtreecommitdiffstats
path: root/apps/files/appinfo
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-11-01 16:16:02 +0100
committerRobin Appelman <icewind@owncloud.com>2012-11-01 16:16:02 +0100
commit51ba12890de08eadd568304039c06f3b718bf868 (patch)
treeaa19d0961b457504b84e4de3c9c4faf2495948ad /apps/files/appinfo
parent6e9e2634978f08494a13bb3c5185032fc0ed7792 (diff)
parent553b1072b66034c7bc97e44af5701c418ca2999f (diff)
downloadnextcloud-server-51ba12890de08eadd568304039c06f3b718bf868.tar.gz
nextcloud-server-51ba12890de08eadd568304039c06f3b718bf868.zip
Merge branch 'master' into filesystem
Diffstat (limited to 'apps/files/appinfo')
-rw-r--r--apps/files/appinfo/filesync.php4
-rw-r--r--apps/files/appinfo/remote.php6
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php
index e755771de64..3953fe3e137 100644
--- a/apps/files/appinfo/filesync.php
+++ b/apps/files/appinfo/filesync.php
@@ -20,8 +20,8 @@
* The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file
*/
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
+// load needed apps
+$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
OC_App::loadApps($RUNTIME_APPTYPES);
if(!OC_User::isLoggedIn()) {
if(!isset($_SERVER['PHP_AUTH_USER'])) {
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 9c7b9ab6d5b..f12430f24dd 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -22,8 +22,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem', 'authentication');
+// load needed apps
+$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
+
OC_App::loadApps($RUNTIME_APPTYPES);
// Backends
@@ -41,6 +42,7 @@ $server->setBaseUri($baseuri);
$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
// And off we go!
$server->exec();