Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

diff --cc README
index bfc84662b3fa1c838b4298496b4c62563da2aabc,4611b06d6838467b07b335a50c074df7b8e255b2..3dd365e1f8218039fae8652ebcb855eda2df8789
--- 1/README
--- 2/README
+++ b/README
@@@ -622,13 -629,13 +622,13 @@@ key and secret, e.g.
  
  In Facebook's application editor, specify the following URLs for your app:
  
- - Callback URL: http://example.net/mublog/facebook/
- - Post-Remove URL: http://example.net/mublog/facebook/remove
+ - Canvas Callback URL: http://example.net/mublog/facebook/
+ - Post-Remove Callback URL: http://example.net/mublog/facebook/remove
  - Post-Add Redirect URL: http://apps.facebook.com/yourapp/
- - Canvas URL: http://apps.facebook.com/yourapp/
+ - Canvas Page URL: http://apps.facebook.com/yourapp/
  
  (Replace 'example.net' with your host's URL, 'mublog' with the path
 -to your Laconica installation, and 'yourapp' with the name of the
 +to your StatusNet installation, and 'yourapp' with the name of the
  Facebook application you created.)
  
  Additionally, Choose "Web" for Application type in the Advanced tab.

diff --cc install.php
Simple merge

diff --cc js/userdesign.go.js
Simple merge

diff --cc lib/facebookaction.php
Simple merge

diff --cc lib/facebookutil.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc tests/HashTagDetectionTests.php
index 0000000000000000000000000000000000000000,283226bd46943b8c5856210b3d96517ceff4f62c..aeac4a5e3f6c932ac0e26a24b2c5610ed3999de1
mode 000000,100644..100644
--- /dev/null
--- 2/tests/HashTagDetectionTests.php
+++ b/tests/HashTagDetectionTests.php
@@@ -1,0 -1,47 +1,47 @@@
 -define('LACONICA', true);
+ <?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('STATUSNET', 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'),
+                      );
+     }
+ }
+