Merge commit 'mainline-write/0.8.x' into 0.8.x

diff --cc tests/HashTagDetectionTests.php
index 4f0b31b0df054749c21e393300a989e924ce76bf,0000000000000000000000000000000000000000..283226bd46943b8c5856210b3d96517ceff4f62c
mode 100644,000000..100644
--- 1/tests/HashTagDetectionTests.php
--- /dev/null
+++ b/tests/HashTagDetectionTests.php
@@@ -1,35 -1,0 +1,47 @@@
-                      array('#hello',
-                            '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>'),
 +<?php
 +
 +if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 +    print "This script must be run from the command line\n";
 +    exit();
 +}
 +
 +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 +define('LACONICA', true);
 +
 +require_once INSTALLDIR . '/lib/common.php';
 +
 +class HashTagDetectionTests extends PHPUnit_Framework_TestCase
 +{
 +    /**
 +     * @dataProvider provider
 +     *
 +     */
 +    public function testProduction($content, $expected)
 +    {
 +        $rendered = common_render_text($content);
 +        $this->assertEquals($expected, $rendered);
 +    }
 +
 +    static public function provider()
 +    {
 +        return array(
 +                     array('hello',
 +                           'hello'),
++                     array('#hello people',
++                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span> people'),
++                     array('"#hello" people',
++                           '&quot;#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>&quot; people'),
++                     array('say "#hello" people',
++                           'say &quot;#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>&quot; people'),
++                     array('say (#hello) people',
++                           'say (#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>) people'),
++                     array('say [#hello] people',
++                           'say [#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>] people'),
++                     array('say {#hello} people',
++                           'say {#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>} people'),
++                     array('say \'#hello\' people',
++                           'say \'#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>\' people'),
 +                     );
 +    }
 +}
 +