From d445b977fc63a4a97b91dd7fc047029115ffaf18 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 14 Apr 2010 11:09:54 +0200
Subject: move comment to correct place

---
 classes/Notice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index b416e2ff2..b0ead3c42 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -148,11 +148,11 @@ class Notice extends Memcached_DataObject
         //turn each into their canonical tag
         //this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
         for($i=0; $i<count($hashtags); $i++) {
+            /* elide characters we don't want in the tag */
             $hashtags[$i] = common_canonical_tag($hashtags[$i]);
         }
 
         foreach(array_unique($hashtags) as $hashtag) {
-            /* elide characters we don't want in the tag */
             $this->saveTag($hashtag);
             self::blow('profile:notice_ids_tagged:%d:%s', $this->profile_id, $hashtag);
         }
-- 
cgit v1.2.3-54-g00ecf


From a21a17263956808e074fb62551300c5d6297387b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 14 Apr 2010 11:11:02 +0200
Subject: Fix for "#foo !foo" in same notice failing during save, causing
 failout before distribution. Move saveGroups after saveTags when saving
 notices; groups may save additional tags, so need to be moved after so the
 check for duplicates actually works.

---
 classes/Notice.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index b0ead3c42..a8147e4c4 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -373,18 +373,20 @@ class Notice extends Memcached_DataObject
             $notice->saveReplies();
         }
 
-        if (isset($groups)) {
-            $notice->saveKnownGroups($groups);
-        } else {
-            $notice->saveGroups();
-        }
-
         if (isset($tags)) {
             $notice->saveKnownTags($tags);
         } else {
             $notice->saveTags();
         }
 
+        // 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();
+        }
+
         if (isset($urls)) {
             $notice->saveKnownUrls($urls);
         } else {
-- 
cgit v1.2.3-54-g00ecf