Fixes #4068 not forcing update on adds when the subtype exists Refs #4058

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 711fcbbd7fa0fc91dce59e90151a77823d65e426..fd2b0e9f935b39b5c40acdf5f5405414014c6887 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -306,8 +306,6 @@ function add_subtype($type, $subtype, $class = "") {
        if ($id == 0) {
                return insert_data("insert into {$CONFIG->dbprefix}entity_subtypes"
                        . " (type, subtype, class) values ('$type','$subtype','$class')");
-       } else {
-               update_subtype($type, $subtype, $class);
        }
 
        return $id;

diff --git a/mod/blog/activate.php b/mod/blog/activate.php
index 5f67ffbed0266b9db340d9bd3fd299fd2d224584..a90525291f9a6edd20883f8ddca5375d4b5577cd 100644 (file)
--- a/mod/blog/activate.php
+++ b/mod/blog/activate.php
@@ -3,4 +3,8 @@
  * Register the ElggBlog class for the object/blog subtype
  */
 
-add_subtype('object', 'blog', 'ElggBlog');
+if (get_subtype_id('object', 'blog')) {
+       update_subtype('object', 'blog', 'ElggBlog');
+} else {
+       add_subtype('object', 'blog', 'ElggBlog');
+}

diff --git a/mod/thewire/activate.php b/mod/thewire/activate.php
index 1db83f7be903bda82e3b18b43eaab7d8e1116980..1cc64ceb1d08c6776ffc9a24a79faad8faf7fd1d 100644 (file)
--- a/mod/thewire/activate.php
+++ b/mod/thewire/activate.php
@@ -3,4 +3,8 @@
  * Register the ElggWire class for the object/thewire subtype
  */
 
-add_subtype('object', 'thewire', 'ElggWire');
+if (get_subtype_id('object', 'thewire')) {
+       update_subtype('object', 'thewire', 'ElggWire');
+} else {
+       add_subtype('object', 'thewire', 'ElggWire');
+}