From 01716dea3d930e6c6b7dd20d5aa6a7fe94db16d1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 20 Mar 2015 16:46:07 -0700
Subject: config to hide version tag from siteinfo - on my site it's
 meaningless.

---
 mod/rpost.php    | 12 +-----------
 mod/siteinfo.php |  3 ++-
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'mod')

diff --git a/mod/rpost.php b/mod/rpost.php
index 398d2bf0f..10ae6b8ab 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -17,6 +17,7 @@ require_once('include/zot.php');
  * f= placeholder, often required
  * title= Title of post
  * body= Body of post
+ * url= URL which will be parsed and the results appended to the body
  * source= Source application
  * remote_return= absolute URL to return after posting is finished
  * type= choices are 'html' or 'bbcode', default is 'bbcode'
@@ -97,16 +98,6 @@ function rpost_content(&$a) {
 		'$title' => t('Edit post')
 	));
 
-	
-//	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
-//		'$baseurl' => $a->get_baseurl(),
-//		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
-//		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
-//		'$geotag' => $geotag,
-//		'$nickname' => $channel['channel_address']
-//	));
-
-
 	if($_REQUEST['url']) {
 		$x = z_fetch_url(z_root() . '/parse_url?f=&url=' . urlencode($_REQUEST['url']));
 		if($x['success'])
@@ -122,7 +113,6 @@ function rpost_content(&$a) {
 			|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 		'acl' => populate_acl($channel),
 		'bang' => '',
-//		'channel_select' => true,
 		'visitor' => true,
 		'profile_uid' => local_channel(),
 		'title' => $_REQUEST['title'],
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index e6798ce50..b69c56ecb 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -54,7 +54,8 @@ function siteinfo_init(&$a) {
 			$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(! get_config('system','hidden_tag_siteinfo'))
+					$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
 			}
 			if(! isset($commit) || strlen($commit) > 16)
 				$commit = '';
-- 
cgit v1.2.3


From 96afe7bf425ae5d2096f078358e174b29365c0f2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 20 Mar 2015 16:49:49 -0700
Subject: set to empty string so it doesn't get mis-handled as a null

---
 mod/siteinfo.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mod')

diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index b69c56ecb..2ad9f7cde 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -56,6 +56,8 @@ function siteinfo_init(&$a) {
 				$commit = trim( @shell_exec('git log -1 --format="%h"'));
 				if(! get_config('system','hidden_tag_siteinfo'))
 					$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
+				else 
+					$tag = '';
 			}
 			if(! isset($commit) || strlen($commit) > 16)
 				$commit = '';
-- 
cgit v1.2.3