Merge remote-tracking branch 'upstream/master'

1 files changed, 57 insertions, 1 deletions

diff --git a/doc/html/bb2diaspora_8php.html b/doc/html/bb2diaspora_8php.html
index 0eecc3512..df7ea4e63 100644
--- a/doc/html/bb2diaspora_8php.html
+++ b/doc/html/bb2diaspora_8php.html
@@ -120,6 +120,8 @@ Functions</h2></td></tr>
 <tr class="separator:ad033be99e87a2aaa05e569c68f30792d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab61b4f8c065e97b151411858bb2f209a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#ab61b4f8c065e97b151411858bb2f209a">share_unshield</a> ($m)</td></tr>
 <tr class="separator:ab61b4f8c065e97b151411858bb2f209a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a4a27604f0745f1efda672966aaca9a3b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b">diaspora_mention_callback</a> ($matches)</td></tr>
+<tr class="separator:a4a27604f0745f1efda672966aaca9a3b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac9061ee10fcfcdac69566b649614e625"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625">diaspora2bb</a> ($s, $use_zrl=false)</td></tr>
 <tr class="separator:ac9061ee10fcfcdac69566b649614e625"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a180b0e3a7d702998be19e3c3b44b0e93"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93">stripdcode_br_cb</a> ($s)</td></tr>
@@ -128,6 +130,10 @@ Functions</h2></td></tr>
 <tr class="separator:adc92ccda5f85ed27e64fcc17712c89cc"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8b96bd45884fa1c40b942939354197d4"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4">diaspora_ol</a> ($s)</td></tr>
 <tr class="separator:a8b96bd45884fa1c40b942939354197d4"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5258d2f1addeb0a2a6b54c4f9e7d0f34"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34">bb2dmention_callback</a> ($match)</td></tr>
+<tr class="separator:a5258d2f1addeb0a2a6b54c4f9e7d0f34"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2052c66bc1006a42b4c230320c269e47"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47">bb2diaspora_itembody</a> ($item)</td></tr>
+<tr class="separator:a2052c66bc1006a42b4c230320c269e47"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a4f10e0876b27373c762bc1abbe745f5c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c">bb2diaspora</a> ($Text, $preserve_nl=false, $fordiaspora=true)</td></tr>
 <tr class="separator:a4f10e0876b27373c762bc1abbe745f5c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a599428bceb6f6d82a6a78cb66811f747"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bb2diaspora_8php.html#a599428bceb6f6d82a6a78cb66811f747">unescape_underscores_in_links</a> ($m)</td></tr>
@@ -167,7 +173,41 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Transform #tags, strip off the [url] and replace spaces with underscore</p>
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc">diaspora_send_followup()</a>, <a class="el" href="diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c">diaspora_send_mail()</a>, <a class="el" href="diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d">diaspora_send_relay()</a>, <a class="el" href="diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668">diaspora_send_status()</a>, and <a class="el" href="bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863">format_event_diaspora()</a>.</p>
+<p>Referenced by <a class="el" href="bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47">bb2diaspora_itembody()</a>, <a class="el" href="diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c">diaspora_send_mail()</a>, <a class="el" href="bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863">format_event_diaspora()</a>, and <a class="el" href="items_8php.html#af0a887050dc8d0f51c89890cdaf3145f">store_diaspora_comment_sig()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a2052c66bc1006a42b4c230320c269e47"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">bb2diaspora_itembody </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$item</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc">diaspora_send_followup()</a>, <a class="el" href="diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d">diaspora_send_relay()</a>, and <a class="el" href="diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668">diaspora_send_status()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a5258d2f1addeb0a2a6b54c4f9e7d0f34"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">bb2dmention_callback </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$match</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
 
 </div>
 </div>
@@ -239,6 +279,22 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a4a27604f0745f1efda672966aaca9a3b"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">diaspora_mention_callback </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$matches</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
 <a class="anchor" id="a8b96bd45884fa1c40b942939354197d4"></a>
 <div class="memitem">
 <div class="memproto">