diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-04-18 19:54:17 -0400 |
| commit | 0d9c5c1ccd66018a819b4ca327ab203f473e35dc (patch) | |
| tree | f55e5caa8bf8036b02fc553eecd2b615791d2ce5 /mod/blog | |
| parent | ca63a6b81eee1dfbee99a393a790402475a4612c (diff) | |
| parent | d928588805375e7190ab393e2def555b39701a27 (diff) | |
| download | elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.gz elgg-0d9c5c1ccd66018a819b4ca327ab203f473e35dc.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'mod/blog')
| -rw-r--r-- | mod/blog/manifest.xml | 1 | ||||
| -rw-r--r-- | mod/blog/start.php | 15 |
2 files changed, 4 insertions, 12 deletions
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml index 4d853a9aa..f0ec96e8b 100644 --- a/mod/blog/manifest.xml +++ b/mod/blog/manifest.xml @@ -16,5 +16,4 @@ </requires> <admin_interface>simple</admin_interface> <activate_on_install>true</activate_on_install> - <on_activate>blog_on_activate</on_activate> </plugin_manifest> diff --git a/mod/blog/start.php b/mod/blog/start.php index 7d42e80b9..33c6ee20d 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -18,7 +18,7 @@ elgg_register_event_handler('init', 'system', 'blog_init'); * Init blog plugin. */ function blog_init() { - + elgg_register_library('elgg:blog', elgg_get_plugins_path() . 'blog/lib/blog.php'); // add a site navigation item @@ -101,14 +101,14 @@ function blog_page_handler($page) { // @todo remove the forwarder in 1.9 // forward to correct URL for bookmarks pre-1.7.5 blog_url_forwarder($page); - + // push all blogs breadcrumb elgg_push_breadcrumb(elgg_echo('blog:blogs'), "blog/all"); if (!isset($page[0])) { $page[0] = 'all'; } - + $page_type = $page[0]; switch ($page_type) { case 'owner': @@ -143,7 +143,7 @@ function blog_page_handler($page) { $params = blog_get_page_content_list(); break; } - + $params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type)); $body = elgg_view_layout('content', $params); @@ -225,13 +225,6 @@ function blog_ecml_views_hook($hook, $entity_type, $return_value, $params) { } /** - * Runs when blog plugin is activated. See manifest file. - */ -function blog_on_activate() { - add_subtype('object', 'blog', 'ElggBlog'); -} - -/** * When upgrading, check if the ElggBlog class has been registered as this * was added in Elgg 1.8 */ |