Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-11-06 21:56:16 -08:00
parent 5376a734d4 d16bbfb224
commit 7b69dc574b
8 changed files with 45 additions and 13 deletions
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -219,7 +219,7 @@ class Ping extends \Zotlabs\Web\Controller {
 						intval(local_channel())
 					);
 					break;
-				case 'messages':
+				case 'mail':
 					$r = q("update mail set mail_seen = 1 where mail_seen = 0 and channel_id = %d ",
 						intval(local_channel())
 					);