From: Andreas Fischer <bantu@owncloud.com>
Date: Wed, 18 Dec 2013 14:44:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
X-Git-Tag: v7.0.0alpha2~1006^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38f4ecaeac3d98b2eb43211c78486c956147ce48;p=nextcloud-server.git

Merge remote-tracking branch 'owncloud/master' into fixing-3417-master

* owncloud/master: (30 commits)
  Added entry with ext storage info
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  clarifying license
  remove unused method tail()
  reliable detect encrypted files
  [tx-robot] updated from transifex
  remove duplicated code
  add missing quotes + field declarations
  Do not use xcache variable cache if cache size is 0.
  always show home breadcrumb in files view
  Use DEBUG instead of ERROR when favourites not found. Fix #6419
  update file cache for target file
  only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
  Fixed JS plural function to be per app
  call set password hook because it doesn't get triggered during test execution and fix paths
  Do not use L10n when logging exceptions
  Also add default to the \OCP\IConfig interface
  add default parameter for AllConfig->get*Value()
  always show 'Deleted Files' breadcrumb
  ...

Conflicts:
	lib/private/memcache/xcache.php
---

38f4ecaeac3d98b2eb43211c78486c956147ce48
diff --cc lib/private/memcache/xcache.php
index 2dc4a3a6016,4485f905207..1337a7ad612
--- a/lib/private/memcache/xcache.php
+++ b/lib/private/memcache/xcache.php
@@@ -57,13 -48,10 +57,16 @@@ class XCache extends Cache 
  		if (\OC::$CLI) {
  			return false;
  		}
 +		if (!function_exists('xcache_unset_by_prefix') && ini_get('xcache.admin.enable_auth')) {
 +			// We do not want to use XCache if we can not clear it without
 +			// using the administration function xcache_clear_cache()
 +			// AND administration functions are password-protected.
 +			return false;
 +		}
- 
+ 		$var_size = (int) ini_get('xcache.var_size');
+ 		if (!$var_size) {
+ 			return false;
+ 		}
  		return true;
  	}
  }