tag tests cont.

diff --git a/mod/item.php b/mod/item.php
index 6b0a7996cf00f8ee19c1ce3b9951cc602280f506..72e63865bd53da577fed451fe10efff853bcbd9a 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -959,7 +959,6 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
                                else
                                        $newname = $r[0]['name'];
                                //add person's id to $inform
-                               $inform_id = 'cid:' . $r[0]['id'];
                                if(strlen($inform))
                                        $inform .= ',';
                                $inform .= 'cid:' . $r[0]['id'];

diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
index 3e370c5456dae06ab4843c6f79378cdfe017db99..68b43231b833ea0289c117bd028716ee48969d4f 100644 (file)
--- a/tests/get_tags_test.php
+++ b/tests/get_tags_test.php
@@ -139,9 +139,19 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
                $str_tags='';\r
                handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);\r
        \r
-               $this->assertEquals("cid:15", $inform); 
-               $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
-               $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);\r
+               // (mike) - This is a tricky case.
+               // we support mentions as in @mike@example.com - which contains a period.
+               // This shouldn't match anything unless you have a contact named "Mike.because".
+               // We may need another test for "@Mike. because" - which should return the contact
+               // as we ignore trailing periods in tags. 
+ 
+//             $this->assertEquals("cid:15", $inform); 
+//             $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
+//             $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);\r
+
+               $this->assertEquals("", $inform); 
+               $this->assertEquals("", $str_tags);
+
        }
        
        /**\r
@@ -253,7 +263,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
                
                $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);\r
                $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);\r
-               $this->assertEquals("cid:15", $inform);
+               // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery
+               $this->assertTrue(strstr($inform,"cid:15"));
        }
        
        /**