Merge branch '0.9.x' into forward

4 files changed, 21 insertions, 28 deletions

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index b18f62726..3c61a682e 100644
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -92,11 +92,23 @@ class GravatarPlugin extends Plugin
     function onStartAvatarSaveForm($action) {
         if ($action->arg('add')) {
             $result = $this->gravatar_save();
+
+            if($result['success']===true) {
+                common_broadcast_profile(common_current_user()->getProfile());
+            }
+
             $action->showForm($result['message'], $result['success']);
+
             return false;
         } else if ($action->arg('remove')) {
             $result = $this->gravatar_remove();
+
+            if($result['success']===true) {
+                common_broadcast_profile(common_current_user()->getProfile());
+            }
+
             $action->showForm($result['message'], $result['success']);
+
             return false;
         } else {
             return true;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d3b9d7cdc..e88e1f222 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -670,8 +670,7 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a,
-.entity_remote_subscribe {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 display:block;
@@ -696,14 +695,6 @@ padding-left:23px;
 padding:2px 4px 1px 26px;
 }
 
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
 .entity_actions .accept {
 margin-bottom:18px;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fc97101bb..d4fcb2343 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -30,8 +30,7 @@ border-radius:4px;
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
 border-color:#AAAAAA;
 }
 
@@ -56,14 +55,12 @@ background:none;
 }
 
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
@@ -81,12 +78,10 @@ background-color:transparent;
 input:focus, textarea:focus, select:focus,
 .form_notice.warning #notice_data-text,
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
 border-color:#9BB43E;
 }
-input.submit,
-.entity_remote_subscribe {
+input.submit {
 color:#FFFFFF;
 }
 .entity_actions input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 728ca9733..0e8fa6d79 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,8 +30,7 @@ border-radius:4px;
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
 border-color:#AAAAAA;
 }
 
@@ -56,14 +55,12 @@ background:none;
 }
 
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
@@ -81,12 +78,10 @@ background-color:transparent;
 input:focus, textarea:focus, select:focus,
 .form_notice.warning #notice_data-text,
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
 border-color:#9BB43E;
 }
-input.submit,
-.entity_remote_subscribe {
+input.submit {
 color:#FFFFFF;
 }
 .entity_actions input.submit {