Merge branch 'master' of https://github.com/friendica/red

1 files changed, 14 insertions, 38 deletions

diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html
index baf3b92f7..4308e6884 100644
--- a/doc/html/include_2menu_8php.html
+++ b/doc/html/include_2menu_8php.html
@@ -114,16 +114,14 @@ $(document).ready(function(){initNavTree('include_2menu_8php.html','');});
 Functions</h2></td></tr>
 <tr class="memitem:a68ebbf492470c930f652013656f9071d"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a68ebbf492470c930f652013656f9071d">menu_fetch</a> ($name, $uid, $observer_xchan)</td></tr>
 <tr class="separator:a68ebbf492470c930f652013656f9071d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7fb5f4847bc94436e43be4b81478febc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a7fb5f4847bc94436e43be4b81478febc">bookmarks_menu_fetch</a> ($uid, $observer_xchan, $flags=<a class="el" href="boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e">MENU_BOOKMARK</a>)</td></tr>
-<tr class="separator:a7fb5f4847bc94436e43be4b81478febc"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a890cc6237971e15f15702e6b2e88502e"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e">menu_render</a> ($menu)</td></tr>
 <tr class="separator:a890cc6237971e15f15702e6b2e88502e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a47447c01ba8ea04cd74af1d4c5b68fc7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7">menu_fetch_id</a> ($menu_id, $channel_id)</td></tr>
 <tr class="separator:a47447c01ba8ea04cd74af1d4c5b68fc7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a08a800821721781a8dfffbe31481ff98"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98">menu_create</a> ($arr)</td></tr>
 <tr class="separator:a08a800821721781a8dfffbe31481ff98"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:acef15a498d52666b1c7e5c12765c689b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b">menu_list</a> ($channel_id)</td></tr>
-<tr class="separator:acef15a498d52666b1c7e5c12765c689b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9ec50f81c81866f4c966410fa099ef10"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a9ec50f81c81866f4c966410fa099ef10">menu_list</a> ($channel_id, $flags=0)</td></tr>
+<tr class="separator:a9ec50f81c81866f4c966410fa099ef10"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a6a33c6a3db2a7510b16cc656edaec571"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571">menu_edit</a> ($arr)</td></tr>
 <tr class="separator:a6a33c6a3db2a7510b16cc656edaec571"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3884bda4d85d84ec99447db9403a68d8"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8">menu_delete</a> ($menu_name, $uid)</td></tr>
@@ -138,38 +136,6 @@ Functions</h2></td></tr>
 <tr class="separator:a9aa8e0052dd47c1a93f53a983bd4620a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <h2 class="groupheader">Function Documentation</h2>
-<a class="anchor" id="a7fb5f4847bc94436e43be4b81478febc"></a>
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">bookmarks_menu_fetch </td>
-          <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$uid</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$observer_xchan</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$flags</em> = <code><a class="el" href="boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e">MENU_BOOKMARK</a></code>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-</div>
-</div>
 <a class="anchor" id="add35fae5e9695031b3d46e30ac409eb8"></a>
 <div class="memitem">
 <div class="memproto">
@@ -424,7 +390,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="acef15a498d52666b1c7e5c12765c689b"></a>
+<a class="anchor" id="a9ec50f81c81866f4c966410fa099ef10"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -432,8 +398,18 @@ Functions</h2></td></tr>
           <td class="memname">menu_list </td>
           <td>(</td>
           <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$channel_id</em></td><td>)</td>
+          <td class="paramname"><em>$channel_id</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">&#160;</td>
+          <td class="paramname"><em>$flags</em> = <code>0</code>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
         </tr>
       </table>
 </div><div class="memdoc">