Peter M. Groen / knowledgetree

Commit ff3c004cc56627cb1a734f231e151629a48938db

Authored by Brad Shuttleworth
1 parent 368b9792

fix for KTS-559 (unable to delete user, without warning). 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5548 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
plugins/ktcore/admin/userManagement.php
  View file @ff3c004
@@ -466,8 +466,6 @@ var $sHelpPage = 'ktcore/admin/manage users.html'; @@ -466,8 +466,6 @@ var $sHelpPage = 'ktcore/admin/manage users.html';
466 exit(0); 466 exit(0);
467 } 467 }
468 468
469 - $oUser->create();  
470 -  
471 $this->successRedirectToMain(_kt('Created new user') . ': "' . $oUser->getUsername() . '"', 'name=' . $oUser->getUsername()); 469 $this->successRedirectToMain(_kt('Created new user') . ': "' . $oUser->getUsername() . '"', 'name=' . $oUser->getUsername());
472 } 470 }
473 471
@@ -477,7 +475,10 @@ var $sHelpPage = 'ktcore/admin/manage users.html'; @@ -477,7 +475,10 @@ var $sHelpPage = 'ktcore/admin/manage users.html';
477 if ((PEAR::isError($oUser)) || ($oUser === false)) { 475 if ((PEAR::isError($oUser)) || ($oUser === false)) {
478 $this->errorRedirectToMain(_kt('Please select a user first.')); 476 $this->errorRedirectToMain(_kt('Please select a user first.'));
479 } 477 }
480 - $oUser->delete(); 478 + $res = $oUser->delete();
  479 + if (PEAR::isError($res)) {
  480 + $this->errorRedirectToMain(sprintf(_kt('Unable to delete user - the user may still be referred by documents.'), $res->getMessage()));
  481 + }
481 482
482 $this->successRedirectToMain(_kt('User deleted') . ': ' . $oUser->getName()); 483 $this->successRedirectToMain(_kt('User deleted') . ': ' . $oUser->getName());
483 } 484 }