aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/entities.php2
-rw-r--r--mod/blog/activate.php6
-rw-r--r--mod/thewire/activate.php6
3 files changed, 10 insertions, 4 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 711fcbbd7..fd2b0e9f9 100644
--- 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 5f67ffbed..a90525291 100644
--- 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 1db83f7be..1cc64ceb1 100644
--- 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');
+}