Don't allow user to send a new message or nudge right after subscribing to another...

darcs-hash:20081120235752-eefa4-42e67140086035ae57c4db38aea48cabb0486d75.gz

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 856586f87a79bc5532ddd550f0811d1d8b649b89..c06057fb8ddca3e3630f060cd1f9046eaa7bc304 100644 (file)
--- 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 653d24b42f2b6cd31e4abd6e6c673ef6c4c570fb..aa9585029feccb98c2dbb7217c20f4fb6025463d 100644 (file)
--- 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));
-                                                                                          }
                                                                                     }
                                        };