Merge branch '0.9.x' into twitstream

[quix0rs-gnu-social.git] / classes / Oauth_application.php

diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index a6b5390872136308d663d0e8c806c26b2496b12a..e81706104eaf6b9c17626d00db371d7d67bb1c0f 100644 (file)
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -110,7 +110,6 @@ class Oauth_application extends Memcached_DataObject
      *
      * @return void
      */
-
     function uploadLogo()
     {
         if ($_FILES['app_icon']['error'] ==
@@ -137,4 +136,20 @@ class Oauth_application extends Memcached_DataObject
         }
     }
 
+    function delete()
+    {
+        $this->_deleteAppUsers();
+
+        $consumer = $this->getConsumer();
+        $consumer->delete();
+
+        parent::delete();
+    }
+
+    function _deleteAppUsers()
+    {
+        $oauser = new Oauth_application_user();
+        $oauser->application_id = $this->id;
+        $oauser->delete();
+    }
 }