Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 16 insertions, 0 deletions

diff --git a/mod/display.php b/mod/display.php
index d1cda4e80..33fb83e70 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,6 +5,10 @@ function display_content(&$a, $update = 0, $load = false) {
 
 //	logger("mod-display: update = $update load = $load");
 
+	if($load)
+		$_SESSION['loadtime'] = datetime_convert();
+
+
 	if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		notice( t('Public access denied.') . EOL);
 		return;
@@ -105,6 +109,15 @@ function display_content(&$a, $update = 0, $load = false) {
 	}
 
 
+	$simple_update = (($update) ? " AND item_unseen = 1 " : '');
+		
+	if($update && $_SESSION['loadtime'])
+		$simple_update .= " and item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ";
+	if($load)
+		$simple_update = '';
+
+
+
 	if((! $update) && (! $load)) {
 
 
@@ -228,6 +241,9 @@ function display_content(&$a, $update = 0, $load = false) {
 		$o .= conversation($a, $items, 'display', $update, 'client');
 	} else {
 		$o .= conversation($a, $items, 'display', $update, 'traditional');
+		if ($items[0]['title'])
+			$a->page['title'] = $items[0]['title'] . " - " . $a->page['title'];
+
 	}
 
 	if($updateable) {