Commit 31c4be85 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5357 Moved mergeObjectClasses in plugin for 1.0.19

parent 5300bda0
......@@ -252,6 +252,12 @@ class plugin
}
}
/* Used by prepare_save and template::apply */
public function mergeObjectClasses(array $oc)
{
return array_merge_unique($oc, $this->objectclasses);
}
protected function templateLoadAttrs($template_attrs)
{
$this->is_template = TRUE;
......
......@@ -657,12 +657,6 @@ class simplePlugin extends plugin
$this->post_save();
}
/* Used by prepare_save and template::apply */
public function mergeObjectClasses(array $oc)
{
return array_merge_unique($oc, $this->objectclasses);
}
protected function prepare_save ()
{
/* Call parents save to prepare $this->attrs */
......
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