Permalink
Browse files

Merge pull request #1 from beck24/master

Small fixes for 1.8 compatibility
  • Loading branch information...
2 parents 6ed9d6b + 31a04cd commit 8e47c52e81056dc1f5fd3a80c2448d6a0bd8f329 @ewinslow ewinslow committed Mar 11, 2012
Showing with 21 additions and 12 deletions.
  1. +16 −8 manifest.xml
  2. +5 −4 start.php
View
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
- <field key="author" value="Cash Costello and Curverider" />
- <field key="version" value="1.0" />
- <field key="description" value="Overrides for Community groups. See README for details." />
- <field key="website" value="http://community.elgg.org/" />
- <field key="copyright" value="(C) Curverider 2010" />
- <field key="licence" value="GNU Public License version 2" />
- <field key="elgg_version" value="2010030101" />
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+ <name>Community Groups</name>
+ <author>Cash Costello and Curverider</author>
+ <version>1.0</version>
+ <description>Overrides for Community groups. See README for details.</description>
+ <website>http://community.elgg.org/</website>
+ <copyright>(C) Curverider 2010</copyright>
+ <license>GNU Public License version 2</license>
+
+ <!-- All plugins must require either elgg_version or elgg_release. -->
+ <requires>
+ <type>elgg_release</type>
+ <version>1.8</version>
+ </requires>
+
+ <category>Enhancements</category>
</plugin_manifest>
View
@@ -10,9 +10,8 @@
* Initialize the community groups extension plugin
*/
function community_groups_init() {
- global $CONFIG;
- $action_path = $CONFIG->pluginspath . 'community_groups/actions';
+ $action_path = elgg_get_plugins_path() . 'community_groups/actions';
elgg_extend_view('css/elgg', 'community_groups/css');
@@ -46,7 +45,7 @@ function community_groups_init() {
));
elgg_register_action('groups/combine', "$action_path/groups/combine.php", 'admin');
elgg_register_action('groups/categorize', "$action_path/groups/categorize.php", 'admin');
- elgg_register_action("groups/delete", $CONFIG->pluginspath . "groups/actions/delete.php", 'admin');
+ elgg_register_action("groups/delete", elgg_get_plugins_path() . "groups/actions/groups/delete.php", 'admin');
elgg_register_action("groups/saveblogsettings", "$action_path/groups/saveblogsettings.php", 'admin');
elgg_register_action("groups/change_owner", "$action_path/groups/change_owner.php", 'admin');
@@ -60,6 +59,8 @@ function community_groups_init() {
elgg_register_plugin_hook_handler('register', 'menu:cg:moderator', 'community_groups_moderator_menu');
elgg_extend_view('object/groupforumtopic', 'community_groups/discussion/controls');
elgg_extend_view('annotation/group_topic_post', 'community_groups/discussion/controls');
+ elgg_register_ajax_view('community_groups/discussion/offtopic');
+ elgg_register_ajax_view('community_groups/discussion/move');
}
elgg_register_plugin_hook_handler('register', 'menu:entity', 'community_groups_limit_editing');
elgg_register_plugin_hook_handler('register', 'menu:annotation', 'community_groups_limit_editing');
@@ -108,7 +109,7 @@ function community_groups_filter_menu($hook, $type, $menu, $params) {
$main_page = !(bool)get_input('filter');
$menu = array();
- $groups = array('featured', 'popular', 'support', 'language', 'developers');
+ $groups = array('featured', 'popular', 'support', 'language', 'developers', 'plugins');
$priority = 100;
foreach ($groups as $name) {
$options = array(

0 comments on commit 8e47c52

Please sign in to comment.