Merge https://github.com/friendica/red into pending_merge

4 files changed, 31 insertions, 3 deletions

diff --git a/mod/channel.php b/mod/channel.php
index 788bacf70..109c9a596 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -329,8 +329,11 @@ function channel_content(&$a, $update = 0, $load = false) {
 		$o .= conversation($a,$items,'channel',$update,'traditional');
 	}
 
-	if((! $update) || ($_COOKIE['jsAvailable'] != 1))
+	if((! $update) || ($_COOKIE['jsAvailable'] != 1)) {
 		$o .= alt_pager($a,count($items));
+		if ($mid && $items[0]['title'])
+			$a->page['title'] = $items[0]['title'] . " - " . $a->page['title'];
+	}
 
 	if($mid) 
 		$o .= '<div id="content-complete"></div>';
diff --git a/mod/display.php b/mod/display.php
index c2e5c2426..d4a1acc5d 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -228,6 +228,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) {
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 1f3cd4479..e6798ce50 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -50,6 +50,18 @@ function siteinfo_init(&$a) {
 
 		$site_info = get_config('system','info');
 		$site_name = get_config('system','sitename');
+		if(! get_config('system','hidden_version_siteinfo')) {
+			$version = RED_VERSION;
+			if(@is_dir('.git') && function_exists('shell_exec')) {
+				$commit = trim( @shell_exec('git log -1 --format="%h"'));
+				$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
+			}
+			if(! isset($commit) || strlen($commit) > 16)
+				$commit = '';
+		}
+		else {
+				$version = $commit = '';
+		}
 		
 		//Statistics
 		$channels_total_stat = intval(get_config('system','channels_total_stat'));
@@ -59,7 +71,8 @@ function siteinfo_init(&$a) {
 		$hide_in_statistics = intval(get_config('system','hide_in_statistics'));
 		
 		$data = Array(
-			'version' => RED_VERSION,
+			'version' => $version,
+			'version_tag' => $tag,
 			'commit' => $commit,
 			'url' => z_root(),
 			'plugins' => $visible_plugins,
diff --git a/view/js/main.js b/view/js/main.js
index 18004726e..a10e91449 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -563,10 +563,19 @@ function updateConvItems(mode,data) {
 			}
 			prev = ident;
 		});
-
+		
 		if(loadingPage) {
 			loadingPage = false;
 		}
+
+		if (window.location.search.indexOf("mid=") != -1 || window.location.pathname.indexOf("display") != -1) {
+			var title = $(".wall-item-title").text();
+			title.replace(/^\s+/, '');
+			title.replace(/\s+$/, '');
+			if (title)
+				document.title = title + " - " + document.title;
+		}
+
 	}
 
 	$('.like-rotator').spin(false);