Rename install hook functions to register hook

diff --git a/lib/base.php b/lib/base.php
index 74b53c56658ad34f78a897226dc45017c2824457..f600800b617a2e3a9895b9e062036af1b78e29e9 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -433,9 +433,9 @@ class OC{
                //setup extra user backends
                OC_User::setupBackends();
 
-               self::installCacheHooks();
-               self::installFilesystemHooks();
-               self::installShareHooks();
+               self::registerCacheHooks();
+               self::registerFilesystemHooks();
+               self::registerShareHooks();
 
                //make sure temporary files are cleaned up
                register_shutdown_function(array('OC_Helper', 'cleanTmp'));
@@ -471,27 +471,27 @@ class OC{
        }
 
        /**
-        * install hooks for the cache
+        * register hooks for the cache
         */
-       public static function installCacheHooks() {
+       public static function registerCacheHooks() {
                // register cache cleanup jobs
                OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
                OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
        }
 
        /**
-        * install hooks for the filesystem
+        * register hooks for the filesystem
         */
-       public static function installFilesystemHooks() {
+       public static function registerFilesystemHooks() {
                // Check for blacklisted files
                OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
                OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
        }
 
        /**
-        * install hooks for sharing
+        * register hooks for sharing
         */
-       public static function installShareHooks() {
+       public static function registerShareHooks() {
                OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
                OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
                OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');

diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 7b856ef020c1a89973f36e60f5800d5195178fce..5cced4946d9b9aba4738eaf18cefd3f15ebce990 100644 (file)
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -74,7 +74,7 @@ class Test_Filesystem extends UnitTestCase {
 
        public function testBlacklist() {
                OC_Hook::clear('OC_Filesystem');
-               OC::installFilesystemHooks();
+               OC::registerFilesystemHooks();
 
                $run = true;
                OC_Hook::emit(

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 25656c6bcd505b61fd2bf46bdb5aecc389abe46c..92f5d065cf26fb7c1bb2703f74a2244d96721420 100644 (file)
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -55,7 +55,7 @@ class Test_Share extends UnitTestCase {
                OC_Group::addToGroup($this->user4, $this->group2);
                OCP\Share::registerBackend('test', 'Test_Share_Backend');
                OC_Hook::clear('OCP\\Share');
-               OC::installShareHooks();
+               OC::registerShareHooks();
        }
 
        public function tearDown() {