Commit 71c831dd authored by bmortier's avatar bmortier

Merge branch '1.0.18-fixes'

parents 20c0279b 8bce5e35
......@@ -95,7 +95,7 @@
<type>entry</type>
<image>geticon.php?context=actions&amp;icon=process-stop&amp;size=16</image>
<label>Abort</label>
</action>
</action>
<action>
<type>separator</type>
......
......@@ -427,7 +427,7 @@ class mailMethod
This function is mainly used to read and write folder permissions.
@return String A valid folder id
*/
public function create_folder_id($folder, $type = "")
public function create_folder_id($folder)
{
if (!empty($folder)) {
$folder = trim(preg_replace("/^INBOX[\.\/]*/i", "", $folder));
......
......@@ -176,11 +176,11 @@ class etablissement extends simplePlugin
}
}
$root_mode = 'add';
} else if (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && $this->set_root) {
} elseif (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && $this->set_root) {
/* We are the root etablissement, we need to update it */
$root_attrs = $this->attrs;
$root_mode = 'modify';
} else if (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && !$this->set_root) {
} elseif (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && !$this->set_root) {
/* We are the root etablissement, we want to delete it */
$root_mode = 'delete';
}
......
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