From: Shashi Gowda <connect2shashi@gmail.com>
Date: Tue, 5 Apr 2011 04:58:05 +0000 (+0530)
Subject: Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ced00cf0bdd4f119e2126e2eba18a3df7ee45c11;p=quix0rs-gnu-social.git

Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
---

ced00cf0bdd4f119e2126e2eba18a3df7ee45c11
diff --cc classes/Notice.php
index 07fa373339,a4f530c44f..5a91e6f13a
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@@ -496,18 -537,10 +537,16 @@@ class Notice extends Memcached_DataObje
  
          // Note: groups may save tags, so must be run after tags are saved
          // to avoid errors on duplicates.
-         if (isset($groups)) {
-             $notice->saveKnownGroups($groups);
-         } else {
-             $notice->saveGroups();
-         }
+         // Note: groups should always be set.
+ 
+         $notice->saveKnownGroups($groups);
  
 +        if (isset($peopletags)) {
 +            $notice->saveProfileTags($peopletags);
 +        } else {
 +            $notice->saveProfileTags();
 +        }
 +
          if (isset($urls)) {
              $notice->saveKnownUrls($urls);
          } else {