diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/blog/manifest.xml | 1 | ||||
| -rw-r--r-- | mod/blog/start.php | 15 | ||||
| -rw-r--r-- | mod/categories/manifest.xml | 2 | ||||
| -rw-r--r-- | mod/categories/start.php | 21 | 
4 files changed, 4 insertions, 35 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   */ diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml index f02d7a8cb..43df13d02 100644 --- a/mod/categories/manifest.xml +++ b/mod/categories/manifest.xml @@ -14,6 +14,4 @@  		<version>2010030101</version>  	</requires>  	<admin_interface>advanced</admin_interface> -	<on_activate>categories_on_activate</on_activate> -	<on_deactivate>categories_on_deactivate</on_deactivate>  </plugin_manifest> diff --git a/mod/categories/start.php b/mod/categories/start.php index 190996d9b..ff5b01efc 100644 --- a/mod/categories/start.php +++ b/mod/categories/start.php @@ -54,24 +54,3 @@ function categories_save($event, $object_type, $object) {  	}  	return TRUE;  } - -/** - * Add a reminder to set default categories. - */ -function categories_on_activate() { -	$site = elgg_get_site_entity(); -	 -	if (!$site->categories) { -		$url = elgg_normalize_url('admin/plugin_settings/categories'); -		$message = elgg_echo('categories:on_enable_reminder', array($url)); -		elgg_add_admin_notice('categories_admin_notice_no_categories', $message); -	} -	return TRUE; -} - -/** - * Clean up admin notices on disable. - */ -function categories_on_deactivate() { -	elgg_delete_admin_notice('categories_admin_notice_no_categories'); -} | 
