Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 1 insertions, 1 deletions

diff --git a/mod/ping.php b/mod/ping.php
index f84bc498d..d43694358 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -157,7 +157,7 @@ function ping_init(&$a) {
 				break;
 			case 'home':
 				$r = q("update item set item_unseen = 0 where item_unseen = 1 and item_wall = 1  and uid = %d", 
-					intval(channel())
+					intval(local_channel())
 				);
 				break;
 			case 'messages':