summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/User/User.php6
-rw-r--r--tests/lib/User/UserTest.php9
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 11c0cc8649a..68787ce60f8 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -218,10 +218,10 @@ class User implements IUser {
$notification = \OC::$server->getNotificationManager()->createNotification();
$notification->setUser($this->uid);
\OC::$server->getNotificationManager()->markProcessed($notification);
- }
- if ($this->emitter) {
- $this->emitter->emit('\OC\User', 'postDelete', array($this));
+ if ($this->emitter) {
+ $this->emitter->emit('\OC\User', 'postDelete', array($this));
+ }
}
return !($result === false);
}
diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php
index 19afa3642dd..5eee5d60d04 100644
--- a/tests/lib/User/UserTest.php
+++ b/tests/lib/User/UserTest.php
@@ -435,16 +435,17 @@ class UserTest extends \Test\TestCase {
public function dataDeleteHooks() {
return [
- [true],
- [false],
+ [true, 2],
+ [false, 1],
];
}
/**
* @dataProvider dataDeleteHooks
* @param bool $result
+ * @param int $expectedHooks
*/
- public function testDeleteHooks($result) {
+ public function testDeleteHooks($result, $expectedHooks) {
$hooksCalled = 0;
$test = $this;
@@ -521,7 +522,7 @@ class UserTest extends \Test\TestCase {
$this->restoreService('CommentsManager');
$this->restoreService('NotificationManager');
- $this->assertEquals(2, $hooksCalled);
+ $this->assertEquals($expectedHooks, $hooksCalled);
}
public function testGetCloudId() {