Fixes #5357 Moved mergeObjectClasses in plugin for 1.0.19

include/class_plugin.inc

@@ -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;

include/simpleplugin/class_simplePlugin.inc

@@ -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 */