Commit 9bf25982 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #946 Cleaned up CSN handling

parent 9b5c1013
......@@ -385,16 +385,10 @@ class plugin
/*!
<<<<<<< HEAD
* \brief Save HTML posted data to object
*/
function save_object()
{
/* Update entry CSN if it is empty. */
if (empty($this->entryCSN) && $this->CSN_check_active) {
$this->entryCSN = getEntryCSN($this->dn);
}
/* Save values to object */
foreach ($this->attributes as $val) {
if ($this->acl_is_writeable($val) && isset ($_POST["$val"])) {
......@@ -424,8 +418,6 @@ class plugin
/*!
=======
>>>>>>> de6fccf... Fixes #946 Cleaned up CSN handling
* \brief Save data to LDAP, depending on is_account we save or delete
*/
function save()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment