Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 10 insertions, 0 deletions

diff --git a/mod/blog/activate.php b/mod/blog/activate.php
new file mode 100644
index 000000000..a90525291
--- /dev/null
+++ b/mod/blog/activate.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Register the ElggBlog class for the object/blog subtype
+ */
+
+if (get_subtype_id('object', 'blog')) {
+	update_subtype('object', 'blog', 'ElggBlog');
+} else {
+	add_subtype('object', 'blog', 'ElggBlog');
+}