Permalink
Browse files

Merge pull request #541 from Lezas/Fix-User_delete

Fix User::delete
  • Loading branch information...
2 parents b2c7c8d + 4bf6d31 commit 24a680dd8de938c87a848934374428d25bbaaa61 @Sieg Sieg committed on GitHub Feb 13, 2017
Showing with 4 additions and 4 deletions.
  1. +1 −3 source/Application/Model/User.php
  2. +3 −1 tests/Unit/Application/Model/UserTest.php
@@ -613,9 +613,7 @@ public function delete($sOXID = null)
$this->deleteAdditionally($sOXIDQuoted);
// and leaving all order related information
- $rs = $oDb->execute("delete from oxremark where oxparentid = {$sOXIDQuoted} and oxtype !='o'");
-
- $blDeleted = $rs->EOF;
+ $oDb->execute("delete from oxremark where oxparentid = {$sOXIDQuoted} and oxtype !='o'");
}
return $blDeleted;
@@ -1250,7 +1250,9 @@ public function testDelete()
$oUser = oxNew('oxUser');
$oUser->load($sUserId);
- $oUser->delete();
+ $bSuccess = $oUser->delete();
+
+ $this->assertEquals(true, $bSuccess);
$aWhat = array('oxuser' => 'oxid',
'oxaddress' => 'oxuserid',

0 comments on commit 24a680d

Please sign in to comment.