Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page

3 files changed, 2 insertions, 18 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 49274103ca8..74a3a1acc86 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -62,7 +62,5 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
-h3.settingsNotice { font-size: 1.2em; }
-.settingsNotice { font-weight:bold; padding: 0.5em 0; }
 input[type=radio] { width:1em; }
 table.shareAPI td { padding-right: 2em; }
\ No newline at end of file
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 5298237f679..295b7761cf3 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -151,9 +151,4 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		</tr>
 		<?php endforeach; ?>
 	</tbody>
-</table>
-
-<!-- use a standard notification class / system for this message -->
-<?php if( $_["share_notice"] ):?>
-<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
-<?php endif;?>	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/settings/users.php b/settings/users.php
index 58018f00ec3..b04f0c99e8f 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -45,14 +45,6 @@ foreach($quotaPreset as &$preset){
 
 $defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
 
-$shareNotice = '';
-
-if (\OC_App::isEnabled( "files_sharing" ) ) {
-
-	$shareNotice = 'Note: users may only share to groups that they belong to, and their members';
-	
-}
-
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
@@ -61,5 +53,4 @@ $tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->assign( 'share_notice', $shareNotice);
-$tmpl->printPage();
+$tmpl->printPage();
\ No newline at end of file