From 711ade9835f3523dcf83702834adef313f9cf54d Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 20 Jul 2009 14:01:51 +1200
Subject: look for full unicode when saving tags

---
 classes/Notice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes/Notice.php')

diff --git a/classes/Notice.php b/classes/Notice.php
index 101fadb67..12b47f360 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -97,11 +97,11 @@ class Notice extends Memcached_DataObject
     function saveTags()
     {
         /* extract all #hastags */
-        $count = preg_match_all('/(?:^|\s)#([A-Za-z0-9_\-\.]{1,64})/', strtolower($this->content), $match);
+        $count = preg_match_all('/(?:^|\s)#([\pL\pN_\-\.]{1,64})/', strtolower($this->content), $match);
         if (!$count) {
             return true;
         }
-
+ 
         /* Add them to the database */
         foreach(array_unique($match[1]) as $hashtag) {
             /* elide characters we don't want in the tag */
-- 
cgit v1.2.3-54-g00ecf


From d95f45f0705467cfc7e3650db932e43f0a20e45f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 20 Jul 2009 14:18:48 +1200
Subject: turn into canonical terms before checking for unique-ness of a tag in
 a notice

---
 classes/Notice.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'classes/Notice.php')

diff --git a/classes/Notice.php b/classes/Notice.php
index 12b47f360..7f002d838 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -101,9 +101,17 @@ class Notice extends Memcached_DataObject
         if (!$count) {
             return true;
         }
+        
+        //turn each into their canonical tag
+        //this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
+        $hashtags = array();
+        for($i=0; $i<count($match[1]); $i++) {
+             $hashtags[] = common_canonical_tag($match[1][$i]);
+        }
+
  
         /* Add them to the database */
-        foreach(array_unique($match[1]) as $hashtag) {
+        foreach(array_unique($hashtags) as $hashtag) {
             /* elide characters we don't want in the tag */
             $this->saveTag($hashtag);
         }
@@ -112,8 +120,6 @@ class Notice extends Memcached_DataObject
 
     function saveTag($hashtag)
     {
-        $hashtag = common_canonical_tag($hashtag);
-
         $tag = new Notice_tag();
         $tag->notice_id = $this->id;
         $tag->tag = $hashtag;
-- 
cgit v1.2.3-54-g00ecf