Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change

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

5 files changed, 13 insertions, 13 deletions

diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index cea806f2f..eb9e4778e 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -17,7 +17,7 @@ function notifications_plugin_init() {
 	elgg_register_event_handler('pagesetup', 'system', 'notifications_plugin_pagesetup');
 
 	// Unset the default notification settings
-	elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
+	elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user-settings_save');
 	elgg_unextend_view('usersettings/user', 'notifications/settings/usersettings');
 
 	// update notifications based on relationships changing
@@ -26,7 +26,7 @@ function notifications_plugin_init() {
 
 	// update notifications when new friend or access collection membership
 	elgg_register_event_handler('create', 'friend', 'notifications_update_friend_notify');
-	elgg_register_plugin_hook_handler('access:collections:add_user', 'collection', 'notifications_update_collection_notify');
+	elgg_register_plugin_hook_handler('access:collections:add-user', 'collection', 'notifications_update_collection_notify');
 }
 
 /**
@@ -161,7 +161,7 @@ function notifications_update_collection_notify($event, $object_type, $returnval
 		}
 		if (in_array($collection_id, $collections_preferences)) {
 			// notifications are on for this collection so we add/remove
-			if ($event == 'access:collections:add_user') {
+			if ($event == 'access:collections:add-user') {
 				add_entity_relationship($user->guid, "notify$method", $member_guid);
 			} elseif ($event == 'access:collections:remove_user') {
 				// removing someone from an access collection is not a guarantee
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 713dff765..8cca13689 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -17,7 +17,7 @@
 <h3>
 	<?php echo elgg_echo('notifications:subscriptions:friends:title'); ?>
 </h3>
-<p class="margin_none">
+<p class="margin-none">
 	<?php echo elgg_echo('notifications:subscriptions:friends:description'); ?>
 </p>
 <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 6c18f6fca..449f908a7 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -14,7 +14,7 @@
 	
 // Display a description
 ?>
-<div class="user_settings notifications">
+<div class="user-settings notifications">
 <?php
 
 
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 7cc393442..0576bc7b9 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -96,7 +96,7 @@ if (!$callback) {
 			
 ?>
 
-<div class="friends_picker">
+<div class="friends-picker">
 
 <?php
 
@@ -106,7 +106,7 @@ if (!$callback) {
 	
 ?>
 
-	<div id="friends_picker_placeholder<?php echo $friendspicker; ?>">
+	<div id="friends-picker_placeholder<?php echo $friendspicker; ?>">
 
 <?php
 	
@@ -149,9 +149,9 @@ if (!isset($vars['replacement'])) {
 		
 ?>
 
-	<div class="friends_picker_wrapper">
-	<div id="friends_picker<?php echo $friendspicker; ?>">
-		<div class="friends_picker_container">
+	<div class="friends-picker-wrapper">
+	<div id="friends-picker<?php echo $friendspicker; ?>">
+		<div class="friends-picker-container">
 <?php
 
 	// Initialise letters
@@ -289,7 +289,7 @@ if (!isset($vars['replacement'])) {
 
 <script type="text/javascript">
 		// initialise picker
-		$("div#friends_picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+		$("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
 </script>
 <script type="text/javascript">
 	$(document).ready(function () {
@@ -300,7 +300,7 @@ if (!isset($vars['replacement'])) {
 		foreach($activeletters as $letter) {
 			$tab = elgg_strpos($chararray, $letter) + 1;
 ?>
-	$("div#friends_picker_navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
+	$("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
 <?php
 		}
 	}
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index b89350acb..bf75f5931 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -20,7 +20,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups'));
 ?>
 
-<div class="user_settings margin_top">
+<div class="user-settings margin-top">
 
 	<?php
 		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);