summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-14 11:15:21 +0200
committerBrion Vibber <brion@pobox.com>2010-04-14 11:15:21 +0200
commit3da50c19dfff7645dc46f1b836ebf4ecda726129 (patch)
treeda9ca58a8ed97fafc209891a8eb1d1fbeb14822e /classes
parenta05e674843afdbae3f138f541624708a664f1f2a (diff)
parenta21a17263956808e074fb62551300c5d6297387b (diff)
Merge branch 'master' into testing
Diffstat (limited to 'classes')
-rw-r--r--classes/Notice.php16
1 files changed, 9 insertions, 7 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 998e9c92b..0d8525637 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);
}
@@ -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 {