diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-01-25 04:02:59 -0800 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-01-25 04:02:59 -0800 |
| commit | 6c87a0713d5b7330be4c276cc78a39bc2a496c38 (patch) | |
| tree | b07034198e1292ddfc2c9a308fcbcbb94914590e /lib | |
| parent | 91133d6fa64b6311b20881e51e97abfd1f7065b3 (diff) | |
| parent | c38e71d7e179678b3a138cd6e96ebca899b2271c (diff) | |
| download | nextcloud-server-6c87a0713d5b7330be4c276cc78a39bc2a496c38.tar.gz nextcloud-server-6c87a0713d5b7330be4c276cc78a39bc2a496c38.zip | |
Merge pull request #1282 from owncloud/connect_hooks
load subadmin.php to make sure that the hooks are connected
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/subadmin.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 3648fffb317..8b5ceeeab3b 100644 --- a/lib/base.php +++ b/lib/base.php @@ -384,6 +384,10 @@ class OC{ OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + // register subadmin hooks
+ OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_SubAdmin', 'post_deleteUser');
+ OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC_SubAdmin', 'post_deleteGroup'); + //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper','cleanTmp')); diff --git a/lib/subadmin.php b/lib/subadmin.php index 9e83e6da430..6d137afb14a 100644 --- a/lib/subadmin.php +++ b/lib/subadmin.php @@ -19,8 +19,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ -OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_SubAdmin', 'post_deleteUser'); -OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC_SubAdmin', 'post_deleteGroup'); + /** * This class provides all methods needed for managing groups. * |