Merge branch 'master' into tres

Conflicts:
	mod/events.php
	view/css/mod_events.css

1 files changed, 21 insertions, 33 deletions

diff --git a/doc/html/diaspora_8php.html b/doc/html/diaspora_8php.html
index 6396a547b..4619009ee 100644
--- a/doc/html/diaspora_8php.html
+++ b/doc/html/diaspora_8php.html
@@ -114,8 +114,8 @@ $(document).ready(function(){initNavTree('diaspora_8php.html','');});
 Functions</h2></td></tr>
 <tr class="memitem:ab99505944728d46585b8312989de533d"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#ab99505944728d46585b8312989de533d">diaspora_dispatch_public</a> ($msg)</td></tr>
 <tr class="separator:ab99505944728d46585b8312989de533d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a6f0a67b6b17503c125af32763be931b7"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch</a> ($importer, $msg, $attempt=1)</td></tr>
-<tr class="separator:a6f0a67b6b17503c125af32763be931b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:af677aaaaf921f5acecf52ae92ac42c66"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch</a> ($importer, $msg)</td></tr>
+<tr class="separator:af677aaaaf921f5acecf52ae92ac42c66"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a858f70153c384f8778082cf7843a19da"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a858f70153c384f8778082cf7843a19da">diaspora_is_blacklisted</a> ($s)</td></tr>
 <tr class="separator:a858f70153c384f8778082cf7843a19da"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a131abd521b218d6ae6f7d2917d8b2605"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605">diaspora_process_outbound</a> ($arr)</td></tr>
@@ -150,8 +150,8 @@ Functions</h2></td></tr>
 <tr class="separator:adef30b6fac948baedcc7194d5d155b5f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7cff2f8f11044c1b3a360f20e1bbee46"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora_message</a> ($importer, $xml, $msg)</td></tr>
 <tr class="separator:a7cff2f8f11044c1b3a360f20e1bbee46"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a71fe9bb66626b4197ae018a230778bb2"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2">diaspora_photo</a> ($importer, $xml, $msg, $attempt=1)</td></tr>
-<tr class="separator:a71fe9bb66626b4197ae018a230778bb2"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a72b2887e8be2e51d0114c16499e6ed4c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a72b2887e8be2e51d0114c16499e6ed4c">diaspora_photo</a> ($importer, $xml, $msg)</td></tr>
+<tr class="separator:a72b2887e8be2e51d0114c16499e6ed4c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5d57518545baa31cf8a85a937a267681"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora_like</a> ($importer, $xml, $msg)</td></tr>
 <tr class="separator:a5d57518545baa31cf8a85a937a267681"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a938c7ee808d38725c0988fa6006805b9"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9">diaspora_retraction</a> ($importer, $xml)</td></tr>
@@ -212,7 +212,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -246,7 +246,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -280,7 +280,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -329,7 +329,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a6f0a67b6b17503c125af32763be931b7"></a>
+<a class="anchor" id="af677aaaaf921f5acecf52ae92ac42c66"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -343,13 +343,7 @@ Functions</h2></td></tr>
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$msg</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$attempt</em> = <code>1</code>&#160;</td>
+          <td class="paramname"><em>$msg</em>&#160;</td>
         </tr>
         <tr>
           <td></td>
@@ -405,7 +399,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a006731620a5242d410358b32678e48e3">diaspora_asphoto()</a>, <a class="el" href="diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829">diaspora_comment()</a>, <a class="el" href="diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f">diaspora_conversation()</a>, <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora_like()</a>, <a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora_message()</a>, <a class="el" href="diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2">diaspora_photo()</a>, <a class="el" href="diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31">diaspora_post()</a>, <a class="el" href="diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f">diaspora_profile()</a>, <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request()</a>, <a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora_reshare()</a>, <a class="el" href="diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9">diaspora_retraction()</a>, and <a class="el" href="diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055">diaspora_signed_retraction()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#a006731620a5242d410358b32678e48e3">diaspora_asphoto()</a>, <a class="el" href="diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829">diaspora_comment()</a>, <a class="el" href="diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f">diaspora_conversation()</a>, <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora_like()</a>, <a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora_message()</a>, <a class="el" href="diaspora_8php.html#a72b2887e8be2e51d0114c16499e6ed4c">diaspora_photo()</a>, <a class="el" href="diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31">diaspora_post()</a>, <a class="el" href="diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f">diaspora_profile()</a>, <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request()</a>, <a class="el" href="diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007">diaspora_reshare()</a>, <a class="el" href="diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9">diaspora_retraction()</a>, and <a class="el" href="diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055">diaspora_signed_retraction()</a>.</p>
 
 </div>
 </div>
@@ -493,7 +487,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -527,7 +521,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -583,7 +577,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a71fe9bb66626b4197ae018a230778bb2"></a>
+<a class="anchor" id="a72b2887e8be2e51d0114c16499e6ed4c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -603,13 +597,7 @@ Functions</h2></td></tr>
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$msg</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname"><em>$attempt</em> = <code>1</code>&#160;</td>
+          <td class="paramname"><em>$msg</em>&#160;</td>
         </tr>
         <tr>
           <td></td>
@@ -619,7 +607,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -653,7 +641,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -705,7 +693,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -780,7 +768,7 @@ Functions</h2></td></tr>
 </div><div class="memdoc">
 <p>If there is a default group for this channel, add this member to it </p>
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -814,7 +802,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -842,7 +830,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>
@@ -1144,7 +1132,7 @@ Functions</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p>Referenced by <a class="el" href="diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7">diaspora_dispatch()</a>.</p>
+<p>Referenced by <a class="el" href="diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66">diaspora_dispatch()</a>.</p>
 
 </div>
 </div>