From 7e1a0e2dcdf8bf424df6ce342767e16c5b89e0b5 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 20 Oct 2010 11:34:41 +0000
Subject: Refs #2489 - manually merged [6981] from 1.7 branch to keep group
 file option consistent across Elgg versions

git-svn-id: http://code.elgg.org/elgg/trunk@7104 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/file/start.php                                 | 4 ++--
 mod/file/views/default/file/groupprofile_files.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'mod')

diff --git a/mod/file/start.php b/mod/file/start.php
index ede4c4def..2ba97403e 100644
--- 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 27f6f5d33..312a5c5cf 100644
--- 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">
-- 
cgit v1.2.3