summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2016-03-10 13:38:48 +0100
committerRobin Appelman <icewind@owncloud.com>2016-03-11 13:15:45 +0100
commita8db587b1f036bba917288372405d8d830faee54 (patch)
tree58de6a57d46dbfcb82feaec1a07efb541c6dd06a
parent3bd6fc797dd5635f3881f303f3b475af636373a7 (diff)
downloadnextcloud-server-a8db587b1f036bba917288372405d8d830faee54.tar.gz
nextcloud-server-a8db587b1f036bba917288372405d8d830faee54.zip
move failedstorage to core
-rw-r--r--apps/files_external/lib/config/configadapter.php2
-rw-r--r--apps/files_sharing/lib/sharedstorage.php2
-rw-r--r--lib/private/files/cache/failedcache.php (renamed from apps/files_external/lib/failedcache.php)4
-rw-r--r--lib/private/files/storage/failedstorage.php (renamed from apps/files_external/lib/failedstorage.php)4
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index d85e0f45631..a19a111d3d9 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -34,7 +34,7 @@ use OCP\IUser;
use OCA\Files_external\Service\UserStoragesService;
use OCA\Files_External\Service\UserGlobalStoragesService;
use OCA\Files_External\Lib\StorageConfig;
-use OCA\Files_External\Lib\FailedStorage;
+use OC\Files\Storage\FailedStorage;
use OCP\Files\StorageNotAvailableException;
/**
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 6257320ca4e..8f4888d20e2 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -31,7 +31,7 @@
namespace OC\Files\Storage;
use OC\Files\Filesystem;
-use OCA\Files_External\Lib\FailedCache;
+use OC\Files\Cache\FailedCache;
use OCA\Files_Sharing\ISharedStorage;
use OCP\Constants;
use OCP\Files\Cache\ICacheEntry;
diff --git a/apps/files_external/lib/failedcache.php b/lib/private/files/cache/failedcache.php
index 2fddb3eca89..0386ba3ca32 100644
--- a/apps/files_external/lib/failedcache.php
+++ b/lib/private/files/cache/failedcache.php
@@ -19,9 +19,8 @@
*
*/
-namespace OCA\Files_External\Lib;
+namespace OC\Files\Cache;
-use OC\Files\Cache\CacheEntry;
use OCP\Constants;
use OCP\Files\Cache\ICache;
@@ -29,6 +28,7 @@ use OCP\Files\Cache\ICache;
* Storage placeholder to represent a missing precondition, storage unavailable
*/
class FailedCache implements ICache {
+ /** @var bool whether to show the failed storage in the ui */
private $visible;
/**
diff --git a/apps/files_external/lib/failedstorage.php b/lib/private/files/storage/failedstorage.php
index 20cf43d74b2..df7f76856d5 100644
--- a/apps/files_external/lib/failedstorage.php
+++ b/lib/private/files/storage/failedstorage.php
@@ -20,10 +20,10 @@
*
*/
-namespace OCA\Files_External\Lib;
+namespace OC\Files\Storage;
+use OC\Files\Cache\FailedCache;
use \OCP\Lock\ILockingProvider;
-use \OC\Files\Storage\Common;
use \OCP\Files\StorageNotAvailableException;
/**