[xoops-svn] SF.net SVN: xoops-svn:[12250] XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/ member.php

[<rgr...@us...>]

Revision: 12250
          http://sourceforge.net/p/xoops/svn/12250
Author:   rgriffith
Date:     2013-12-29 02:13:45 +0000 (Sun, 29 Dec 2013)
Log Message:
-----------
Fix #1272 -- delete functions always return true

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php	2013-12-29 01:51:53 UTC (rev 12249)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php	2013-12-29 02:13:45 UTC (rev 12250)
@@ -123,9 +123,9 @@
      */
     function deleteGroup(&$group)
     {
-        $this->_gHandler->delete($group);
-        $this->_mHandler->deleteAll(new Criteria('groupid', $group->getVar('groupid')));
-        return true;
+        $s1 = $this->_mHandler->deleteAll(new Criteria('groupid', $group->getVar('groupid')));
+        $s2 = $this->_gHandler->delete($group);
+        return ($s1 && $s2) ? true : false;
     }
 
     /**
@@ -136,9 +136,9 @@
      */
     function deleteUser(&$user)
     {
-        $this->_uHandler->delete($user);
-        $this->_mHandler->deleteAll(new Criteria('uid', $user->getVar('uid')));
-        return true;
+        $s1 = $this->_mHandler->deleteAll(new Criteria('uid', $user->getVar('uid')));
+        $s2 = $this->_uHandler->delete($user);
+        return ($s1 && $s2) ? true : false;
     }
 
     /**