Refs #2489 - manually merged [6981] from 1.7 branch to keep group file option consist...

git-svn-id: http://code.elgg.org/elgg/trunk@7104 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/file/start.php b/mod/file/start.php
index ede4c4def0d62e524b8b353fcf0ff3c210206c50..2ba97403e5488a1a919f06abcde18ed3338528f6 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -57,7 +57,7 @@
                register_plugin_hook('notify:entity:message', 'object', 'file_notify_message');
                
                // add the group files tool option     
-               add_group_tool_option('files',elgg_echo('groups:enablefiles'),true);
+               add_group_tool_option('file',elgg_echo('groups:enablefiles'),true);
 
                // Register entity type
                register_entity_type('object','file');
@@ -81,7 +81,7 @@
                
                // Group submenu option 
                        if ($page_owner instanceof ElggGroup && get_context() == "groups") {
-                       if($page_owner->files_enable != "no"){ 
+                       if($page_owner->file_enable != "no"){ 
                                    add_submenu_item(sprintf(elgg_echo("file:group"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
                            }
                        }

diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index 27f6f5d3334a19df67d0e3aa95a74fa76bf86a34..312a5c5cfdec5f841d3b68f35015e13d247b1d87 100644 (file)
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -3,7 +3,7 @@
     // Files on group profile page
 
     //check to make sure group files is activated
-    if($vars['entity']->files_enable != 'no'){
+    if($vars['entity']->file_enable != 'no'){
 
 ?>
 <div class="group_tool_widget files">