Only trigger postDelete hooks when the user was deleted...

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 7859db23b6b817ff59aa185fa44543e60aa4ea20..decd32ac82e00229fc402134bdfb1b2beeb7a602 100644 (file)
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -216,10 +216,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 69bab0b659b6f6c9d4acc4e7779efae4413f6cd4..d72d7af7c3a802b7e49ae5ead20b45888f27e381 100644 (file)
--- a/tests/lib/User/UserTest.php
+++ b/tests/lib/User/UserTest.php
@@ -430,16 +430,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;
 
@@ -516,7 +517,7 @@ class UserTest extends \Test\TestCase {
                $this->restoreService('CommentsManager');
                $this->restoreService('NotificationManager');
 
-               $this->assertEquals(2, $hooksCalled);
+               $this->assertEquals($expectedHooks, $hooksCalled);
        }
 
        public function testGetCloudId() {