Merge remote-tracking branch 'upstream/master'

1 files changed, 230 insertions, 23 deletions

diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html
index 838addbc4..a2d4d76da 100644
--- a/doc/html/conversation_8php.html
+++ b/doc/html/conversation_8php.html
@@ -112,19 +112,28 @@ $(document).ready(function(){initNavTree('conversation_8php.html','');});
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:afea815dd1768e8417d2b30be53e9e0b4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a>(!function_exists('item_extract_images')) <br class="typebreak"/>
-<a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a>(!function_exists('item_redir_and_replace_images'))&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4">localize_item</a> (&amp;$item)</td></tr>
-<tr class="separator:afea815dd1768e8417d2b30be53e9e0b4"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0ee05f15255fb1cc3d89f30bc378a654"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654">item_extract_images</a> ($body)</td></tr>
+<tr class="separator:a0ee05f15255fb1cc3d89f30bc378a654"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:adda79b75bf1ccf6ce9503aa310953533"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533">item_redir_and_replace_images</a> ($body, $images, $cid)</td></tr>
+<tr class="separator:adda79b75bf1ccf6ce9503aa310953533"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9bd7f9fb6678736c581bcba3b17f471c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c">localize_item</a> (&amp;$item)</td></tr>
+<tr class="separator:a9bd7f9fb6678736c581bcba3b17f471c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab2383dff4f823e580399ff469d90ab19"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#ab2383dff4f823e580399ff469d90ab19">count_descendants</a> ($item)</td></tr>
 <tr class="separator:ab2383dff4f823e580399ff469d90ab19"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7eeaaf44506815576f3bd80053ef52c3"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3">visible_activity</a> ($item)</td></tr>
 <tr class="separator:a7eeaaf44506815576f3bd80053ef52c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a32e7750ae6adbfdd1f227f6e89221ce3"><td class="memItemLeft" align="right" valign="top"><a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a>(!function_exists('conversation'))&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3">best_link_url</a> ($item)</td></tr>
-<tr class="separator:a32e7750ae6adbfdd1f227f6e89221ce3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aedf008b9eac87f693d7dcc1a01404d85"><td class="memItemLeft" align="right" valign="top"><a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a>(!function_exists('item_photo_menu')) <br class="typebreak"/>
-<a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a>(!function_exists('like_puller')) <br class="typebreak"/>
-<a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a>(!function_exists('format_like'))&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85">status_editor</a> ($a, $<a class="el" href="boot_8php.html#a01353c9abebc3544ea080ac161729632">x</a>, $popup=false)</td></tr>
-<tr class="separator:aedf008b9eac87f693d7dcc1a01404d85"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1e97305a441dc143edbe09e17d1ceda1"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation</a> (&amp;$a, $items, $mode, $update, $page_mode= 'traditional')</td></tr>
+<tr class="separator:a1e97305a441dc143edbe09e17d1ceda1"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad470fc7766f0db66d138fa1916c7a8b7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7">best_link_url</a> ($item)</td></tr>
+<tr class="separator:ad470fc7766f0db66d138fa1916c7a8b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aacbb12d372d5e9c3ab0735b4aea48fb3"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3">item_photo_menu</a> ($item)</td></tr>
+<tr class="separator:aacbb12d372d5e9c3ab0735b4aea48fb3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:afe5b2f38d8b803edb0d7ec5fa2868db0"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0">like_puller</a> ($a, $item, &amp;$arr, $mode)</td></tr>
+<tr class="separator:afe5b2f38d8b803edb0d7ec5fa2868db0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a3d8e30cc94f9a175054c021305d3aca3"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3">format_like</a> ($cnt, $arr, $type, $id)</td></tr>
+<tr class="separator:a3d8e30cc94f9a175054c021305d3aca3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2a7d541854bba755eb8ada59af7dcb1a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a">status_editor</a> ($a, $<a class="el" href="boot_8php.html#a01353c9abebc3544ea080ac161729632">x</a>, $popup=false)</td></tr>
+<tr class="separator:a2a7d541854bba755eb8ada59af7dcb1a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7f6ef0dfa554bacf620e84c18d386e67"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67">get_item_children</a> ($arr, $parent)</td></tr>
 <tr class="separator:a7f6ef0dfa554bacf620e84c18d386e67"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae996eb116d397a2c6396c312d7b98664"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="conversation_8php.html#ae996eb116d397a2c6396c312d7b98664">sort_item_children</a> ($items)</td></tr>
@@ -175,12 +184,12 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a32e7750ae6adbfdd1f227f6e89221ce3"></a>
+<a class="anchor" id="ad470fc7766f0db66d138fa1916c7a8b7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a> (!function_exists('conversation')) best_link_url </td>
+          <td class="memname">best_link_url </td>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname"><em>$item</em></td><td>)</td>
@@ -188,11 +197,8 @@ Functions</h2></td></tr>
         </tr>
       </table>
 </div><div class="memdoc">
-<p>"Render" a conversation or list of items for HTML display. There are two major forms of display:</p>
-<ul>
-<li>Sequential or unthreaded ("New Item View" or search results)</li>
-<li>conversation view The $mode parameter decides between the various renderings and also figures out how to determine page owner and other contextual items that are based on unique features of the calling module. </li>
-</ul>
+
+<p>Referenced by <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>.</p>
 
 </div>
 </div>
@@ -224,6 +230,57 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a1e97305a441dc143edbe09e17d1ceda1"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">conversation </td>
+          <td>(</td>
+          <td class="paramtype">&amp;&#160;</td>
+          <td class="paramname"><em>$a</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$items</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$mode</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$update</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$page_mode</em> = <code>'traditional'</code>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<p>"Render" a conversation or list of items for HTML display. There are two major forms of display:</p>
+<ul>
+<li>Sequential or unthreaded ("New Item View" or search results)</li>
+<li>conversation view The $mode parameter decides between the various renderings and also figures out how to determine page owner and other contextual items that are based on unique features of the calling module. </li>
+</ul>
+
+<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a">community_content()</a>, <a class="el" href="display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0">display_content()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, <a class="el" href="classItem.html#aa452b5bcd8dea12119b09212c615cb41">Item\remove_parent()</a>, <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>, and <a class="el" href="classItem.html#aa8b1bbc4236890694635295e46d7fd72">Item\set_conversation()</a>.</p>
+
+</div>
+</div>
 <a class="anchor" id="ab2383dff4f823e580399ff469d90ab19"></a>
 <div class="memitem">
 <div class="memproto">
@@ -267,6 +324,46 @@ Functions</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a3d8e30cc94f9a175054c021305d3aca3"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">format_like </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$cnt</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$arr</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$type</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$id</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>.</p>
+
+</div>
+</div>
 <a class="anchor" id="a0891aaa4492cba2b51eda12fe01957f3"></a>
 <div class="memitem">
 <div class="memproto">
@@ -281,7 +378,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>.</p>
+<p>Referenced by <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>, and <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>.</p>
 
 </div>
 </div>
@@ -311,12 +408,122 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="afea815dd1768e8417d2b30be53e9e0b4"></a>
+<a class="anchor" id="a0ee05f15255fb1cc3d89f30bc378a654"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">item_extract_images </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$body</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c">localize_item()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="aacbb12d372d5e9c3ab0735b4aea48fb3"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">item_photo_menu </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="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>, and <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="adda79b75bf1ccf6ce9503aa310953533"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">item_redir_and_replace_images </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$body</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$images</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$cid</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c">localize_item()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="afe5b2f38d8b803edb0d7ec5fa2868db0"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">like_puller </td>
+          <td>(</td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$a</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$item</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&amp;&#160;</td>
+          <td class="paramname"><em>$arr</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$mode</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a9bd7f9fb6678736c581bcba3b17f471c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a> (!function_exists('item_extract_images')) <a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a> (!function_exists('item_redir_and_replace_images')) localize_item </td>
+          <td class="memname">localize_item </td>
           <td>(</td>
           <td class="paramtype">&amp;&#160;</td>
           <td class="paramname"><em>$item</em></td><td>)</td>
@@ -326,7 +533,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>Render actions localized </p>
 
-<p>Referenced by <a class="el" href="include_2api_8php.html#a4c6fb9fb5203aa60f4b3afd4521db8ea">api_format_items()</a>, <a class="el" href="include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3">format_notification()</a>, and <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>.</p>
+<p>Referenced by <a class="el" href="include_2api_8php.html#a4c6fb9fb5203aa60f4b3afd4521db8ea">api_format_items()</a>, <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>, <a class="el" href="include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3">format_notification()</a>, and <a class="el" href="classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8">Item\get_template_data()</a>.</p>
 
 </div>
 </div>
@@ -458,12 +665,12 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="aedf008b9eac87f693d7dcc1a01404d85"></a>
+<a class="anchor" id="a2a7d541854bba755eb8ada59af7dcb1a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a> (!function_exists('item_photo_menu')) <a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a> (!function_exists('like_puller')) <a class="el" href="redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea">if</a> (!function_exists('format_like')) status_editor </td>
+          <td class="memname">status_editor </td>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname"><em>$a</em>, </td>
@@ -506,7 +713,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2">Item\__construct()</a>, and <a class="el" href="conversation_8php.html#ab2383dff4f823e580399ff469d90ab19">count_descendants()</a>.</p>
+<p>Referenced by <a class="el" href="classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2">Item\__construct()</a>, <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>, and <a class="el" href="conversation_8php.html#ab2383dff4f823e580399ff469d90ab19">count_descendants()</a>.</p>
 
 </div>
 </div>