summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsarven <csarven@controlyourself.ca>2008-11-20 18:57:52 -0500
committercsarven <csarven@controlyourself.ca>2008-11-20 18:57:52 -0500
commit7b099a4c6b4b2e851aa9fa95c6c2c9b35c95bd65 (patch)
treee8707d79e5244740719383a8e6b2c2a838679db6
parent491172638e5e2e652b7ab485ec03afa4b043e8ae (diff)
Don't allow user to send a new message or nudge right after subscribing to another contact
darcs-hash:20081120235752-eefa4-42e67140086035ae57c4db38aea48cabb0486d75.gz
-rw-r--r--actions/subscribe.php1
-rw-r--r--js/util.js8
2 files changed, 0 insertions, 9 deletions
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 856586f87..c06057fb8 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -63,7 +63,6 @@ class SubscribeAction extends Action {
common_element_end('head');
common_element_start('body');
common_unsubscribe_form($profile);
- common_profile_new_message_nudge($cur, $profile);
common_element_end('body');
common_element_end('html');
} else {
diff --git a/js/util.js b/js/util.js
index 653d24b42..aa9585029 100644
--- a/js/util.js
+++ b/js/util.js
@@ -99,14 +99,6 @@ $(document).ready(function(){
var form_subscribe_id = form_unsubscribe_id.replace('unsubscribe', 'subscribe');
$("form#"+form_subscribe_id).replaceWith(form_unsubscribe);
$("form#"+form_unsubscribe_id).ajaxForm(UnSubscribe).each(addAjaxHidden);
- var p_sanm = $('#profile_send_a_new_message', xml).get(0);
- if (p_sanm) {
- $("#profile_actions").append(document._importNode(p_sanm, true));
- }
- var p_n = $('#profile_nudge', xml).get(0);
- if (p_n) {
- $("#profile_actions").append(document._importNode(p_n, true));
- }
}
};