summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-02-23 17:54:32 +0100
committerRobin Appelman <icewind@owncloud.com>2015-02-25 15:09:41 +0100
commitbf65b1f18b4737f02b1f55e923b718a10851d5cf (patch)
tree958b516da39a127506270e1ab761d9382dd044b6
parent9873ab20afde7def037dcee2e00921d01e52ae82 (diff)
downloadnextcloud-server-bf65b1f18b4737f02b1f55e923b718a10851d5cf.tar.gz
nextcloud-server-bf65b1f18b4737f02b1f55e923b718a10851d5cf.zip
Rename getAsyncCommandBus to getCommandBus
-rw-r--r--apps/files_encryption/appinfo/app.php2
-rw-r--r--lib/private/server.php2
-rw-r--r--lib/public/iservercontainer.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index c547a0c5e19..440f5cf78e0 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -50,7 +50,7 @@ if (!OC_Config::getValue('maintenance', false)) {
OCP\User::logout();
}
-\OC::$server->getAsyncCommandBus()->requireSync('\OC\Command\FileAccess');
+\OC::$server->getCommandBus()->requireSync('\OC\Command\FileAccess');
// Register settings scripts
OCP\App::registerAdmin('files_encryption', 'settings-admin');
diff --git a/lib/private/server.php b/lib/private/server.php
index ca3a17451ac..8b6a0874ab8 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -785,7 +785,7 @@ class Server extends SimpleContainer implements IServerContainer {
/**
* @return \OCP\Command\IBus
*/
- function getAsyncCommandBus(){
+ function getCommandBus(){
return $this->query('AsyncCommandBus');
}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 3b73426d9fb..6714a5265f7 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -321,5 +321,5 @@ interface IServerContainer {
/**
* @return \OCP\Command\IBus
*/
- function getAsyncCommandBus();
+ function getCommandBus();
}