merge 0.9.x into 1.0.x

2011-05-04 14:59:39 -07:00
parent 7e1ae44fad 753bc7302a
commit c97048d01b
13 changed files with 318 additions and 68 deletions
--- a/plugins/GroupPrivateMessage/Group_message_profile.php
+++ b/plugins/GroupPrivateMessage/Group_message_profile.php
@@ -125,7 +125,10 @@ class Group_message_profile extends Memcached_DataObject

        $gmp->insert();

-        $gmp->notify();
+        // If it's not for the author, send email notification
+        if ($gm->from_profile != $profile->id) {
+            $gmp->notify();
+        }

        return $gmp;
    }